From 7a90b194a7d1a213d01c323fd90ef5afbdeb4ea7 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 16:21:02 +0800
Subject: [PATCH] 保养修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
index c12f8ec..7ab68b1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -127,6 +127,21 @@
<if test="params.finishEndTime != null">
and t1.actual_end_time <= #{params.finishEndTime}
</if>
+ <if test="params.workCenterIds != null">
+ and t3.work_center_id in
+ <foreach collection="params.workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
+ <if test="params.equipmentId != null">
+ and t1.equipment_id = #{params.equipmentId}
+ </if>
+ <if test="params.statusEnums != null">
+ and t1.status not in
+ <foreach collection="params.statusEnums" open="(" separator="," close=")" item="statusEnum">
+ #{statusEnum}
+ </foreach>
+ </if>
ORDER BY t1.create_time desc
</select>
@@ -220,6 +235,21 @@
<if test="params.finishEndTime != null">
and t1.actual_end_time <= #{params.finishEndTime}
</if>
+ <if test="params.workCenterIds != null">
+ and t3.work_center_id in
+ <foreach collection="params.workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
+ <if test="params.equipmentId != null">
+ and t1.equipment_id = #{params.equipmentId}
+ </if>
+ <if test="params.statusEnums != null">
+ and t1.status not in
+ <foreach collection="params.statusEnums" open="(" separator="," close=")" item="statusEnum">
+ #{statusEnum}
+ </foreach>
+ </if>
ORDER BY t1.create_time desc
</select>
@@ -246,10 +276,11 @@
LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
- WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily'
+ WHERE t1.del_flag = '0' AND t2.type = 'daily'
<if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
</if>
+-- AND t2.del_flag = '0' AND t3.del_flag = '0'
</select>
<select id="getRepairUser" parameterType="Map" resultType="map">
@@ -275,10 +306,11 @@
LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
- WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily' and t1.maintenance_role = 'maintenance'
+ WHERE 1=1 AND t2.type = 'daily' and t1.maintenance_role = 'maintenance'
<if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
</if>
+-- t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0'
</select>
<select id="getOperationUser" parameterType="Map" resultType="map">
@@ -304,9 +336,10 @@
LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
- WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily' and t1.maintenance_role = 'operator'
+ WHERE 1=1 AND t2.type = 'daily' and t1.maintenance_role = 'operator'
<if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
</if>
+ -- t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0'
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3