设备管理修改

qushaowei

2024-07-12 15ae1e3b5cda40a8248a1addf4a64c1e0a9e2b13

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml

@@ -12,20 +12,28 @@
            resultType="org.jeecg.modules.eam.entity.RepairOrderActualWorkHours">

        SELECT t1.id                                          id,
               t1.user_num as userNum,
               t2.id userId,
               t1.start_time                                  startTime,
               t1.end_time                                    endTime,
               t1.principal_contractor                        principalContractor,
               t1.theoretical_time                            theoreticalTime,
               t7.item_text                                   principalContractor_dictText,
               t1.user_num                                 as userNum,
               t1.user_id                                         userId,
               t1.repair_order_id                          as repairOrderId,
               t1.actual_hour,
               t2.username username,
               t1.actual_hour,----------
               t2.username                                    username,
               t2.realname                                 as realname,
               t4.name                                     as teamName,
               concat(t6.num, '/', t6.name, '/', t6.model) as equipmentId
--                t4.name                                     as teamName,
               (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_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') t7
                           on t1.principal_contractor = t7.item_value
        WHERE t1.repair_order_id = #{mainId}
          and t1.del_flag = 0

@@ -39,12 +47,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}