From d29ac80ff9cc861a61bfad83e1985c90706eff2c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 26 一月 2024 13:47:06 +0800
Subject: [PATCH] 大屏车间管理
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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..e286929 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,17 +7,35 @@
SELECT
mew.id id,
a.EquipmentID equipmentId,
- mew.equipment_image equipmentImage,
+ me.equipment_name equipmentName,
+ me.equipment_type equipmentType,
+ met.equipment_type_pictures equipmentImage,
a.Oporation equipmentStatus,
mew.coordinate_left coordinateLeft,
mew.coordinate_top coordinateTop,
mew.vw vw,
- mew.vh vh
+ mew.vh vh,
+ me.id equId
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
+ INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
+ AND a.CollectTime= b.maxgdtime
+ AND mew.workshop_id = #{ workshopId }
+ </select>
+
+ <select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">
+ SELECT
+ DISTINCT t1.*
+ FROM
+ mdc_workshop_info t1
+ LEFT JOIN sys_permission t2 ON t1.perms = t2.perms
+ LEFT JOIN sys_role_permission t3 ON t2.id = t3.permission_id
+ LEFT JOIN sys_role t4 ON t4.id = t3.role_id
+ LEFT JOIN sys_user_role t5 ON t5.role_id = t4.id
+ WHERE
+ t5.user_id = #{ userId }
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3