From f571cf0182abd65176fb1512c5cb5ddaea49c4a3 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 24 六月 2025 09:00:14 +0800
Subject: [PATCH] feat(eims): 设备状态变更记录功能
---
eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsInventoryDetailMapper.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsInventoryDetailMapper.xml b/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsInventoryDetailMapper.xml
index a97f8f8..b1667ae 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsInventoryDetailMapper.xml
+++ b/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsInventoryDetailMapper.xml
@@ -7,23 +7,24 @@
</resultMap>
<select id="selectInventoryDetailList" resultMap="EimsInventoryDetailResult">
- SELECT c.equ_code equCode,
+ SELECT a.id id, c.equ_code equCode,
c.equ_name equName,
c.asset_no equAssetNo,
e.dept_name deptName,
d.type_name equTypeName,
c.location location,
+ a.`status` status,
b.`status` inventoryStatus,
c.`status` equStatus,
d.`status` typeStatus,
- b.inventory_user inventoryUser
+ f.nick_name inventoryUser
FROM eims_inventory_detail a
- JOIN eims_inventory b on a.inventory_id = b.inventory_id
- JOIN eims_equ c on a.equ_id = c.equ_id
- JOIN eims_equ_type d on c.equ_type_id = d.equ_type_id
- JOIN sys_dept e on e.dept_id = c.dept_used
+ LEFT JOIN eims_inventory b on a.inventory_id = b.inventory_id
+ LEFT JOIN eims_equ c on a.equ_id = c.equ_id
+ LEFT JOIN eims_equ_type d on c.equ_type_id = d.equ_type_id
+ LEFT JOIN sys_dept e on e.dept_id = c.dept_used
+ LEFT JOIN sys_user f on b.inventory_user = f.user_id
${ew.getCustomSqlSegment}
</select>
-
</mapper>
--
Gitblit v1.9.3