设备管理-更新代码提交 截止 20230819

zenglf

2023-08-19 d2d083528159fe9291a67f51886f98fe646efd95

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

@@ -19,12 +19,16 @@
        t1.technical_status as technicalStatus,
        t2.specification as specification,
        t1.update_by as updateBy,
        t1.update_time as updateTime
        t1.update_time as updateTime,
        t4.name  as  responsibilityTeamName,
        t3.realname  as  responsibilityUserName


        FROM
        mom_eam_equipment_unloading_borrow_detail t1
        LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
        LEFT JOIN sys_user t3 ON t1.responsibility_user_id = t3.id
        LEFT JOIN mom_base_team t4 ON t1.responsibility_team_id = t4.id
        <if test="equipmentUnloadingId != null and equipmentUnloadingId != ''">
               WHERE t1.del_flag = 0 and t1.equipment_unloading_id = #{equipmentUnloadingId}
        </if>
@@ -39,8 +43,6 @@
        t1.responsibility_user_id as responsibilityUserId,
        t1.responsibility_team_id as responsibilityTeamId,
        t1.actual_borrow_date as actualBorrowDate,
        t1.responsibility_team_id as responsibilityTeamId,
        t1.responsibility_user_id as responsibilityUserId,
        t1.equipment_id as equipmentId,
        t1.technical_status as technicalStatus,
        t2.num as equipmentNum,
@@ -52,11 +54,13 @@
        t1.update_time as updateTime,
        t3.id AS responsibilityUserId,
        t3.realname as responsibilityUserName,
        t4.item_text  as  equipmentStatusName
        t4.item_text  as  equipmentStatusName,
        t5.name  as  responsibilityTeamName
        FROM
        mom_eam_equipment_unloading_borrow_detail t1
        LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
        LEFT JOIN sys_user t3 ON t1.responsibility_user_id = t3.id
        LEFT JOIN mom_base_team t5 ON t1.responsibility_team_id = t5.id
        left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'equipment_status' ) t4 on t4.item_value = t2.equipment_status

        WHERE t1.del_flag = 0