From 6a3591c42a84b36d24d75f4584f0eeb145bb4de7 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 15 三月 2024 15:00:24 +0800
Subject: [PATCH] xg
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 492e4b3..4e0ace6 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
@@ -238,16 +238,14 @@
<if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
AND t1.drive_type = #{mdcEquipment.driveType}
</if>
- <if test="mdcEquipment.productionName != null and mdcEquipment.productionName != '' ">
- AND t3.id = #{ mdcEquipment.productionName } OR t3.parent_id = #{ mdcEquipment.productionName }
+ <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=")">
+ #{id}
+ </foreach>
</if>
</where>
order by t1.sort_no
- </select>
-
-
- <select id="getWorkLineLast" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentDto">
- select top 1 spindlespeed, actualspindlespeed from [${tableName}] order by CollectTime desc
</select>
<select id="exportXlsList" resultType="org.jeecg.modules.mdc.entity.MdcEquipment">
@@ -268,16 +266,24 @@
AND t1.equipment_name = #{mdcEquipment.equipmentModel}
</if>
<if test="mdcEquipment.equipmentType != null and mdcEquipment.equipmentType != '' ">
- AND t1.equipmentType = #{mdcEquipment.equipmentType}
+ AND t1.equipment_type = #{mdcEquipment.equipmentType}
</if>
<if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
AND t1.drive_type = #{mdcEquipment.driveType}
</if>
- <if test="mdcEquipment.productionName != null and mdcEquipment.productionName != '' ">
- AND t3.id = #{ mdcEquipment.productionName } OR t3.parent_id = #{ mdcEquipment.productionName }
+ <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=")">
+ #{id}
+ </foreach>
</if>
</where>
order by t1.sort_no
</select>
+ <!--鏌ヨ鍗曡〃鏁版嵁-->
+ <select id="findWorkLineLast" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentDto">
+ select top 1 spindlespeed, actualspindlespeed from [${tableName}] order by CollectTime desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3