From 15a20a91316b726f45ccc9e06bbd632f10eedb43 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 13 九月 2024 14:10:55 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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..925e610 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
@@ -58,6 +58,9 @@
WHERE
med.equipment_id = me.id
AND med.dep_id = #{ departId }
+ <if test="key != null and key != '' ">
+ AND me.device_abnormal_status = 1
+ </if>
ORDER BY me.equipment_id
</select>
@@ -71,6 +74,9 @@
WHERE
mpe.equipment_id = me.id
AND mpe.production_id = #{ productionId }
+ <if test="key != null and key != '' ">
+ AND me.device_abnormal_status = 1
+ </if>
ORDER BY me.equipment_id
</select>
@@ -83,9 +89,9 @@
LEFT JOIN mdc_production_equipment mpe ON me.id = mpe.equipment_id
WHERE
mpe.production_id IN
- <foreach collection="allProductionIds" index="index" item="id" open="(" separator="," close=")">
- #{id}
- </foreach>
+ <foreach collection="allProductionIds" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
</select>
<!--鏌ヨ璁惧鐩戞帶淇℃伅-->
@@ -132,7 +138,8 @@
sd.org_type,
me.equipment_id,
me.equipment_name,
- me.equipment_type
+ me.equipment_type,
+ me.equipment_model
FROM
mdc_equipment_depart med
LEFT JOIN sys_depart sd ON med.dep_id = sd.id
@@ -155,7 +162,8 @@
mp.org_type,
me.equipment_id,
me.equipment_name,
- me.equipment_type
+ me.equipment_type,
+ me.equipment_model
FROM
mdc_production_equipment mpe
LEFT JOIN mdc_production mp ON mpe.production_id = mp.id
@@ -215,6 +223,9 @@
<if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' ">
AND t1.device_category = #{mdcEquipment.deviceCategory}
</if>
+ <if test="mdcEquipment.deviceAbnormalStatus != null and mdcEquipment.deviceAbnormalStatus != '' ">
+ AND t1.device_abnormal_status = #{mdcEquipment.deviceAbnormalStatus}
+ </if>
<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=")">
--
Gitblit v1.9.3