From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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..4549cec 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,15 +16,15 @@
                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,
                t2.realname                                 as realname,
 --                t4.name                                     as teamName,
-               concat(t6.num, '/', t6.name, '/', t6.model) as equipmentId
+               (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
@@ -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