From 998307fa4f923e37064853a2583b48103dd0d89b Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 12 十月 2023 11:36:41 +0800
Subject: [PATCH] 大屏设备图片处理
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
index 9a5eed6..c0e00a6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -7,6 +7,8 @@
SELECT
mew.id id,
a.EquipmentID equipmentId,
+ me.equipment_name equipmentName,
+ me.equipment_type equipmentType,
mew.equipment_image equipmentImage,
a.Oporation equipmentStatus,
mew.coordinate_left coordinateLeft,
@@ -15,9 +17,10 @@
mew.vh vh
FROM
EquipmentLog a
- INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
- INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
- AND a.CollectTime= b.maxgdtime
- AND mew.workshop_id = #{ workshopId }
+ INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
+ INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
+ INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
+ AND a.CollectTime= b.maxgdtime
+ AND mew.workshop_id = #{ workshopId }
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3