From f73f8cb6753f8d8ab2c689b4640cd2688e6f6f62 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 16 九月 2025 11:06:42 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 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 4cd73de..0c73a4d 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
@@ -218,6 +218,12 @@
<if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' ">
AND t1.device_category = #{mdcEquipment.deviceCategory}
</if>
+ <if test="mdcEquipment.equipmentStatus != null ">
+ AND t1.equipment_status = #{mdcEquipment.equipmentStatus}
+ </if>
+ <if test="mdcEquipment.attribute != null ">
+ AND t1.attribute = #{mdcEquipment.attribute}
+ </if>
<if test="mdcEquipment.productionIds != null and mdcEquipment.productionIds.size() > 0 ">
AND t3.id IN
<foreach collection="mdcEquipment.productionIds" index="index" item="id" open="(" separator="," close=")">
@@ -279,4 +285,31 @@
t1.id = #{ id }
</select>
+ <!--鏍规嵁浜х嚎id鑾峰彇璁惧鐘舵�佸垪琛�-->
+ <select id="getEquipmentMonitorList" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentMonitor">
+ 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