From e88c6ac544e52359c7eabc94edef7bb1e133c7e2 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 18 三月 2025 16:49:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 a4943b3..3029e7d 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
@@ -71,12 +71,7 @@
WHERE
mpe.equipment_id = me.id
AND mpe.production_id = #{ productionId }
- <if test="type == 'DNC'">
- AND me.device_type_dnc = '1'
- </if>
- <if test="type == 'MDC'">
AND me.device_type_mdc = '1'
- </if>
ORDER BY me.equipment_id
</select>
@@ -282,4 +277,23 @@
t1.id = #{ id }
</select>
+ <select id="queryByProductionIdAndType" resultType="org.jeecg.modules.mdc.entity.MdcEquipment">
+ SELECT
+ me.*
+ FROM
+ mdc_production_equipment mpe,
+ mdc_equipment me
+ WHERE
+ mpe.equipment_id = me.id
+ AND mpe.production_id = #{ productionId }
+ AND me.device_type_dnc = '1'
+ <if test="deviceIds != null and deviceIds.size() > 0">
+ AND me.id IN
+ <foreach collection = "deviceIds" item = "id" index = "index" open = "(" close= ")" separator = ",">
+ #{id}
+ </foreach>
+ </if>
+ ORDER BY me.equipment_id
+ </select>
+
</mapper>
--
Gitblit v1.9.3