From ebb0ec9bd15de8185994962c37b15a94c8b4ee0d Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期一, 13 一月 2025 20:05:16 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 15 +++++++++++++++ 1 files changed, 15 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 e29c675..0d8024e 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 @@ -142,6 +142,7 @@ <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")"> #{id} </foreach> + AND me.equipment_status = 0 </where> ORDER BY sd.depart_order </select> @@ -165,6 +166,7 @@ <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")"> #{id} </foreach> + AND me.equipment_status = 0 </where> ORDER BY mp.production_order </select> @@ -263,4 +265,17 @@ select top 1 spindlespeed, actualspindlespeed from [${tableName}] order by CollectTime desc </select> + <!--鏍规嵁id鑾峰彇璁惧淇℃伅--> + <select id="findById" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentDetailedDto"> + SELECT + t1.*, + t2.MaxAxis maxAxis, + t2.ValidAxis validAxis + FROM + mdc_equipment t1 + LEFT JOIN EquipmentBaseInfo t2 ON t1.equipment_id = t2.EquipmentID + WHERE + t1.id = #{ id } + </select> + </mapper> \ No newline at end of file -- Gitblit v1.9.3