From 56e8ccde7c982bc2a5b9746edb2e596c895f63e6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 13 十二月 2023 15:20:07 +0800
Subject: [PATCH] 利用率页面添加平均值和合计值
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 ec86d85..0053426 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
@@ -8,7 +8,6 @@
t1.num,
t1.version,
t1.depart_id as departId,
- t1.team_id as teamId,
t1.equipment_id AS equipmentId,
t2.num AS equipmentNum,
t2.NAME AS equipmentName,
@@ -51,7 +50,6 @@
t1.id,
t1.num,
t1.depart_id as departId,
- t1.team_id as teamId,
t1.equipment_id AS equipmentId,
t2.num AS equipmentNum,
t2.NAME AS equipmentName,
@@ -70,7 +68,17 @@
t4.name as teamName,
t2.use_id useId,
t7.depart_name as useDepartName,
- t1.remark
+ t1.remark,
+ t1.take_effect_time as takeEffectTime,
+ t1.lose_efficacy_time as loseEfficacyTime,
+ t1.approval_status as approvalStatus,
+ t8.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
FROM
mom_eam_maintenance_standard t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
@@ -79,6 +87,7 @@
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 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
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},'%')
--
Gitblit v1.9.3