From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 1272c41..d9d4034 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
@@ -22,7 +22,20 @@
t3.depart_name as useDepartName,
t2.use_id as useId,
t4.id as teamId,
- t4.name as teamName
+ t4.name as teamName,
+ t1.take_effect_time as takeEffectTime,
+ 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
@@ -30,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},'%')
--
Gitblit v1.9.3