From 7d709870c406ae6c930b202c24dd6a2a8a7bc5ef Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 21 八月 2023 17:29:42 +0800
Subject: [PATCH] lnl,修后汇报
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualMaterialMapper.xml | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml | 10 +++++-----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualMaterialMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualMaterialMapper.xml
index 94fd7e8..9a0d493 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualMaterialMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualMaterialMapper.xml
@@ -69,7 +69,7 @@
LEFT JOIN mom_eam_spare_part t2 on t2.id = t1.spare_part_id
LEFT JOIN mom_base_constructor t3 on t3.id = t2.constructor_id
LEFT JOIN mom_eam_spare_part_outbound t4 on t4.id = t1.outbound_order_id
- LEFT JOIN mom_eam_spare_part_outbound_detail t5 on t5.spare_part_outbound_id = t4.id
+-- LEFT JOIN mom_eam_spare_part_outbound_detail t5 on t5.spare_part_outbound_id = t4.id
LEFT JOIN mom_base_unit t6 on t6.id = t2.main_unit_id
LEFT JOIN mom_eam_report_after_repair t7 on t7.id = t1.report_after_repair_id
LEFT JOIN mom_eam_equipment t8 on t8.id = t7.equipment_id
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml
index 090a2f0..2ddd9c5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml
@@ -39,12 +39,12 @@
t1.report_after_repair_id as num,
t1.actual_hour,
t2.realname as realName,
- t4.name as teamName,
+-- t4.name as teamName,
concat(t6.num, '/', t6.name, '/', t6.model) as equipmentId
FROM mom_eam_repair_order_actual_work_hours t1
LEFT JOIN sys_user t2 on t2.id = t1.user_id
- LEFT JOIN mom_base_team_class t3 on t3.id = t2.team_class_id
- LEFT JOIN mom_base_team t4 on t4.id = t3.team_id
+-- LEFT JOIN mom_base_team_class t3 on t3.id = t2.team_class_id
+-- LEFT JOIN mom_base_team t4 on t4.id = t3.team_id
LEFT JOIN mom_eam_report_after_repair t5 on t5.id = t1.report_after_repair_id
LEFT JOIN mom_eam_equipment t6 on t6.id = t5.equipment_id
WHERE t1.report_after_repair_id = #{mainId}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
index d135d5c..65a1ea3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
@@ -67,12 +67,12 @@
select
t1.realname as realName,
t1.id,
- t1.user_code as userCode,
- t3.name as teamName,
- t3.id as teamId
+ t1.username as userCode
+-- t3.name as teamName,
+-- t3.id as teamId
FROM sys_user t1
- LEFT JOIN mom_base_team_class t2 on t2.id =t1.team_class_id
- LEFT JOIN mom_base_team t3 on t3.id =t2.team_id
+-- LEFT JOIN mom_base_team_class t2 on t2.id =t1.team_class_id
+-- LEFT JOIN mom_base_team t3 on t3.id =t2.team_id
where t1.realname IS NOT NULL
<if test="realname != null and realname != ''">
and t1.realname like concat('%',#{realname},'%')
--
Gitblit v1.9.3