From 79bb09af27e6b2e6b4b898af7a1922e9c82f8762 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 04 三月 2025 14:03:13 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 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 e286929..2bec069 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
@@ -4,26 +4,37 @@
<select id="getBigScreenInfo" resultType="org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto">
+ WITH LatestEquipmentLog AS (
+ SELECT
+ EquipmentID,
+ MAX(CollectTime) AS maxgdtime
+ FROM
+ EquipmentLog
+ GROUP BY
+ EquipmentID
+ )
SELECT
- mew.id id,
- a.EquipmentID equipmentId,
- 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,
- me.id equId
+ mew.id AS id,
+ a.EquipmentID AS equipmentId,
+ me.equipment_name AS equipmentName,
+ me.equipment_type AS equipmentType,
+ met.equipment_type_pictures AS equipmentImage,
+ a.Oporation AS oporation,
+ me.equipment_status AS equipmentStatus,
+ mew.coordinate_left AS coordinateLeft,
+ mew.coordinate_top AS coordinateTop,
+ mew.vw AS vw,
+ mew.vh AS vh,
+ me.id AS 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
- 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 }
+ INNER JOIN LatestEquipmentLog b ON a.EquipmentID = b.EquipmentID AND a.CollectTime = b.maxgdtime
+ 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
+ INNER JOIN mdc_workshop_info mwi ON mew.workshop_id = mwi.id
+ WHERE
+ mwi.production_id = #{productionId}
</select>
<select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">
@@ -38,4 +49,15 @@
WHERE
t5.user_id = #{ userId }
</select>
+
+ <select id="productionListByUser" resultType="org.jeecg.modules.system.entity.MdcProduction">
+ SELECT
+ t1.*
+ FROM
+ mdc_production t1
+ LEFT JOIN mdc_user_production t2 ON t1.id = t2.pro_id
+ WHERE
+ t1.org_type = 2 AND t2.user_id = #{userId}
+ ORDER BY t1.production_name
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3