From d2d083528159fe9291a67f51886f98fe646efd95 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期六, 19 八月 2023 14:32:11 +0800
Subject: [PATCH] 设备管理-更新代码提交 截止 20230819
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingReturnDetailMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingReturnDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingReturnDetailMapper.xml
index 760549a..10bd964 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingReturnDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingReturnDetailMapper.xml
@@ -19,12 +19,15 @@
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_return_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>
@@ -40,8 +43,6 @@
t1.responsibility_team_id as responsibilityTeamId,
t1.actual_return_date as actualReturnDate,
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,
@@ -51,12 +52,13 @@
t1.update_by as updateBy,
t1.update_time as updateTime,
t3.id AS responsibilityUserId,
- t3.realname as responsibilityUserName
+ t3.realname as responsibilityUserName,
+ t5.name as responsibilityTeamName
FROM
mom_eam_equipment_unloading_return_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
WHERE t1.del_flag = 0
<if test="params.equipmentUnloadingId != null and params.equipmentUnloadingId != ''">
and t1.equipment_unloading_id = #{params.equipmentUnloadingId}
--
Gitblit v1.9.3