From c89ca4524fa8311ebb415a2f225d2f95da780603 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 03 三月 2025 11:23:53 +0800
Subject: [PATCH] 车间选择列表

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 0d8024e..58aaf78 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
@@ -107,6 +107,7 @@
         <foreach collection="equipmentIds" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
+        ORDER BY t1.equipment_id
     </select>
 
     <!--鏍规嵁閮ㄩ棬id鏌ヨ璁惧id闆嗗悎-->
@@ -278,4 +279,21 @@
             t1.id = #{ id }
     </select>
 
+    <!--鏍规嵁浜х嚎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>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3