From 286375a43369462cd75147271949cf819916912f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 一月 2024 16:39:17 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml
index 4b780a8..3588fc9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml
@@ -29,7 +29,7 @@
left join sys_depart t4 on t2.use_id = t4.id
left join mom_base_team t5 on t2.team_id = t5.id
left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
- where t1.del_flag = 0 and t1.type = #{params.type}
+ where t1.del_flag = 0 and t1.type = #{params.type} and t2.technology_status in ('qualified','limitedUse')
<if test="params.useId != null and params.useId != ''">
and t2.use_id = #{params.useId}
</if>
@@ -44,6 +44,9 @@
</if>
<if test="params.equipmentNum != null and params.equipmentNum != ''">
and t2.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.maintenanceType != null and params.maintenanceType != ''">
+ and t1.maintenance_type = #{params.maintenanceType}
</if>
ORDER BY t1.create_time desc
</select>
@@ -75,7 +78,7 @@
left join sys_depart t4 on t2.use_id = t4.id
left join mom_base_team t5 on t2.team_id = t5.id
left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
- where t1.del_flag = 0 and t1.type = #{params.type} and t2.equipment_importance_id in ('A','B','C')
+ where t1.del_flag = 0 and t1.type = #{params.type} and t2.equipment_importance_id in ('A','B','C') and t2.technology_status in ('qualified','limitedUse')
<if test="params.useId != null and params.useId != ''">
and t2.use_id = #{params.useId}
</if>
@@ -90,6 +93,9 @@
</if>
<if test="params.equipmentNum != null and params.equipmentNum != ''">
and t2.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.maintenanceType != null and params.maintenanceType != ''">
+ and t1.maintenance_type = #{params.maintenanceType}
</if>
ORDER BY t1.create_time desc
</select>
@@ -122,6 +128,8 @@
t1.lose_efficacy_time as loseEfficacyTime,
t1.approval_status as approvalStatus,
t8.item_text as approvalStatusName,
+ t1.maintenance_type as maintenanceType,
+ t9.item_text as maintenanceTypeName,
t1.audit_feedback as auditFeedback,
t1.approval_feedback as approvalFeedback,
t1.write_person as writePerson,
@@ -137,6 +145,7 @@
left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
left join sys_depart t7 on t2.use_id = t7.id
left join (select * from v_sys_dict where dict_code = 'approval_status') t8 on t1.approval_status = t8.item_value
+ left join (select * from v_sys_dict where dict_code = 'maintenance_type') t9 on t1.maintenance_type = t9.item_value
where t1.del_flag = 0 and t1.type = #{params.type}
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
@@ -150,6 +159,9 @@
<if test="params.equipmentNum != null and params.equipmentNum != ''">
and t2.num like concat('%',#{params.equipmentNum},'%')
</if>
+ <if test="params.maintenanceType != null and params.maintenanceType != ''">
+ and t1.maintenance_type = #{params.maintenanceType}
+ </if>
ORDER BY t1.create_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3