From 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 九月 2025 16:51:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
index 119f496..be9dd4f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
@@ -46,5 +46,23 @@
</where>
ORDER BY oas.storage_time DESC, oas.id DESC
</select>
+ <select id="pageList" resultType="com.ruoyi.system.vo.StorageListVO">
+ select t1.*,t2.type_name as assetTypeName,
+ case
+ when t1.use_dept_id is not null and t1.use_dept_id != '' then t3.dept_name
+ when t1.address is not null and t1.address != '' then t1.address
+ when t1.warehouse_name is not null and t1.warehouse_name != '' then t1.warehouse_name
+ else null
+ end as useName
+
+
+ from asset_main t1
+ left join asset_type t2 on t3.id = t1.asset_type_id
+ left join t_dept t3 on t4.id = t3.ownership_dept_id
+ where t1.approval_application_id = #{query.approvalApplicationId}
+ order by t1.create_time desc
+
+
+ </select>
</mapper>
--
Gitblit v1.7.1