From 75d26035001d85c12dc3ca93455b0fee477c3f77 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 03 三月 2025 16:47:58 +0800
Subject: [PATCH] 看板设备状态概况及月利用路趋势接口

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 58aaf78..05d4b7d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -281,19 +281,29 @@
 
     <!--鏍规嵁浜х嚎id鑾峰彇璁惧鐘舵�佸垪琛�-->
     <select id="getEquipmentMonitorList" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentMonitor">
-        SELECT e.equipment_id,
-               et.CollectTime,
-               e.equipment_name,
-               et.Oporation,
-               e.id,
-               e.equipment_status,
-               e.equipment_type AS equipmentType,
-               etp.equipment_type_pictures
-        FROM mdc_equipment e
-                 LEFT JOIN Equipment et ON e.equipment_id = et.EquipmentID
-                 LEFT JOIN mdc_equipment_type etp ON e.equipment_type = etp.equipment_type_name
-                 JOIN mdc_workshop_equipment we ON e.equipment_id = we.equipment_id
-        WHERE we.workshop_id = #{workshopId}
+        SELECT
+            t1.equipment_id,
+            t2.CollectTime,
+            t1.equipment_name,
+            t2.Oporation,
+            t1.id,
+            t1.equipment_status,
+            t1.equipment_type AS equipmentType,
+            t3.equipment_type_pictures
+        FROM
+            mdc_equipment t1
+                JOIN
+            mdc_workshop_equipment t4
+            ON t1.equipment_id = t4.equipment_id
+                JOIN
+            mdc_workshop_info t5
+            ON t4.workshop_id = t5.id AND t5.production_id = #{productionId}
+                LEFT JOIN
+            Equipment t2
+            ON t1.equipment_id = t2.EquipmentID
+                LEFT JOIN
+            mdc_equipment_type t3
+            ON t1.equipment_type = t3.equipment_type_name
     </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3