From 15ae1e3b5cda40a8248a1addf4a64c1e0a9e2b13 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 七月 2024 18:02:04 +0800
Subject: [PATCH] 设备管理修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml
index 55b7a31..6c73eb5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml
@@ -24,7 +24,18 @@
t4.id as teamId,
t4.name as teamName,
t1.take_effect_time as takeEffectTime,
- t1.lose_efficacy_time as loseEfficacyTime
+ t1.lose_efficacy_time as loseEfficacyTime,
+ t1.approval_status as approvalStatus,
+ t7.item_text as approvalStatusName,
+ t1.audit_feedback as auditFeedback,
+ t1.approval_feedback as approvalFeedback,
+ t1.write_person as writePerson,
+ t1.audit_person as auditPerson,
+ t1.approval_person as approvalPerson,
+ t1.lose_efficacy_person as loseEfficacyPerson,
+ t1.dis_uda1 as disUda1,
+ t1.dis_uda2 as disUda2,
+ t1.dis_uda3 as disUda3
FROM
mom_eam_daily_inspection_standard t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
@@ -32,6 +43,7 @@
left join mom_base_team t4 on t2.team_id = t4.id
left join (select * from v_sys_dict where dict_code = 'version_status') t5 on t1.version_status = t5.item_value
left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
+ left join (select * from v_sys_dict where dict_code = 'approval_status') t7 on t1.approval_status = t7.item_value
where t1.del_flag = 0
<if test="num != 'null' and num != ''">
and t1.num like concat('%',#{num},'%')
@@ -40,7 +52,7 @@
and t2.name like concat('%',#{name},'%')
</if>
<if test="versionStatus != 'null' and versionStatus != ''">
- and t1.version_status like concat('%',#{versionStatus},'%')
+ and t1.version_status = #{versionStatus}
</if>
<if test="versionStatus == 'null' ">
and t1.version_status='2'
--
Gitblit v1.9.3