From 7ca0b4b585a109b427b510548c78f3e1dcf5ba37 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 26 九月 2024 15:57:42 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 2 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml | 1 + lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 3 +++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml index 267045c..40631f8 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml @@ -46,6 +46,7 @@ #{ id } </foreach> </if> + AND t2.device_abnormal_status = 1 ORDER BY t1.the_date </select> @@ -96,6 +97,7 @@ #{ id } </foreach> </if> + AND t2.device_abnormal_status = 1 ORDER BY t1.the_date </select> @@ -146,6 +148,7 @@ <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' "> AND t2.device_importance_level = #{vo.deviceImportanceLevel} </if> + AND t2.device_abnormal_status = 1 </where> GROUP BY t2.equipment_id, 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 925e610..c58d194 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 @@ -149,6 +149,7 @@ <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")"> #{id} </foreach> + AND me.device_abnormal_status = 1 </where> ORDER BY sd.depart_order </select> @@ -173,6 +174,7 @@ <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")"> #{id} </foreach> + AND me.device_abnormal_status = 1 </where> ORDER BY mp.production_order </select> 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 08c7fcc..9ee2316 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,7 @@ <if test="mdcOverallEquipmentEfficiency.deviceImportanceLevel != null and mdcOverallEquipmentEfficiency.deviceImportanceLevel != '' "> AND t2.device_importance_level = #{mdcOverallEquipmentEfficiency.deviceImportanceLevel} </if> + AND t2.device_abnormal_status = 1 </where> </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3