From 22d31632a106266333bee84149f6af5c88415e85 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 08 七月 2025 11:30:15 +0800
Subject: [PATCH] 定期生成点检工单，定期扫描已过期点检工单
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 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..cd5b126 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
@@ -142,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>
@@ -155,7 +163,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
@@ -165,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>
@@ -215,6 +225,12 @@
<if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' ">
AND t1.device_category = #{mdcEquipment.deviceCategory}
</if>
+ <if test="mdcEquipment.deviceImportanceLevel != null and mdcEquipment.deviceImportanceLevel != '' ">
+ AND t1.device_importance_level = #{mdcEquipment.deviceImportanceLevel}
+ </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=")">
@@ -248,6 +264,18 @@
<if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
AND t1.drive_type = #{mdcEquipment.driveType}
</if>
+ <if test="mdcEquipment.deviceLevel != null and mdcEquipment.deviceLevel != '' ">
+ AND t1.device_level = #{mdcEquipment.deviceLevel}
+ </if>
+ <if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' ">
+ AND t1.device_category = #{mdcEquipment.deviceCategory}
+ </if>
+ <if test="mdcEquipment.deviceImportanceLevel != null and mdcEquipment.deviceImportanceLevel != '' ">
+ AND t1.device_importance_level = #{mdcEquipment.deviceImportanceLevel}
+ </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