From ad2dc8af7b4159fdd663d60bc15107f20259c356 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 08 十月 2024 09:19:21 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
index 801e2da..d7f45f9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
@@ -76,6 +76,9 @@
<if test="mdcOverallEquipmentEfficiency.deviceImportanceLevel != null and mdcOverallEquipmentEfficiency.deviceImportanceLevel != '' ">
AND t2.device_importance_level = #{mdcOverallEquipmentEfficiency.deviceImportanceLevel}
</if>
+ <if test="mdcOverallEquipmentEfficiency.max != null and mdcOverallEquipmentEfficiency.max != '' and mdcOverallEquipmentEfficiency.min != null and mdcOverallEquipmentEfficiency.min!= ''">
+ AND t1.overall_equipment_efficiency BETWEEN #{mdcOverallEquipmentEfficiency.min} AND #{mdcOverallEquipmentEfficiency.max}
+ </if>
AND t2.device_abnormal_status = 1
</where>
</select>
@@ -105,8 +108,11 @@
WHERE
( t4.id = #{productionId} OR t4.parent_id = #{productionId} )
AND t1.valid_date = #{date}
- <if test="equipmentType != null and equipmentType != ''">
- AND t2.equipment_type = #{equipmentType}
+ <if test="equipmentTypeList != null and equipmentTypeList.size() > 0">
+ AND t2.equipment_type IN
+ <foreach collection="equipmentTypeList" item="equipmentType" index="index" open="(" close=")" separator=",">
+ #{equipmentType}
+ </foreach>
</if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3