From 32be453ce79ce4e9efbeb3ab4ef6db501a6f0230 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期一, 31 三月 2025 09:19:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml index 3029e7d..7b7f06e 100644 --- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml +++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml @@ -296,4 +296,32 @@ ORDER BY me.equipment_id </select> + <select id="findByProductionIds" resultType="org.jeecg.modules.mdc.entity.MdcEquipment"> + SELECT + t1.* + FROM + mdc_equipment t1 + LEFT JOIN mdc_production_equipment t2 ON t1.id = t2.equipment_id + WHERE t2.production_id IN + <foreach collection="mdcProductionIds" item = "productionId" index = "index" open = "(" close= ")" separator = ","> + #{productionId} + </foreach> + </select> + + <select id="findByProIdsAndTeamCode" resultType="org.jeecg.modules.mdc.entity.MdcEquipment"> + SELECT + t1.* + FROM + mdc_equipment t1 + LEFT JOIN mdc_production_equipment t2 ON t1.id = t2.equipment_id + WHERE t2.production_id IN + <foreach collection="mdcProductionIds" item = "productionId" index = "index" open = "(" close= ")" separator = ","> + #{productionId} + </foreach> + AND t1.team_code IN + <foreach collection="teamCodeList" item = "teamCode" index = "index" open = "(" close= ")" separator = ","> + #{teamCode} + </foreach> + </select> + </mapper> -- Gitblit v1.9.3