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/RepairOrderActualWorkHoursMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
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 da994eb..0b4f164 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
@@ -16,9 +16,9 @@
t1.end_time endTime,
t1.principal_contractor principalContractor,
t1.theoretical_time theoreticalTime,
- t6.item_text principalContractor_dictText,
+ t7.item_text principalContractor_dictText,
t1.user_num as userNum,
- t2.id userId,
+ t1.user_id userId,
t1.repair_order_id as repairOrderId,
t1.actual_hour,----------
t2.username username,
@@ -32,8 +32,8 @@
LEFT JOIN mom_eam_repair_order t5 on t5.id = t1.repair_order_id
LEFT JOIN mom_eam_equipment t6 on t6.id = t5.equipment_id
- left join (select * from v_sys_dict where dict_code = 'yn') t6
- on t1.principal_contractor = t6.item_value
+ left join (select * from v_sys_dict where dict_code = 'yn') t7
+ on t1.principal_contractor = t7.item_value
WHERE t1.repair_order_id = #{mainId}
and t1.del_flag = 0
--
Gitblit v1.9.3