From 27d8f8fbb2e02be63338b80f808969faa35adac0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 11:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 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 65e8625..119f496 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
@@ -17,4 +17,34 @@
id, approval_application_id, title, asset_type_id, storage_type, storage_time
</sql>
+ <!-- 分页查询：资产入库申请列表（关联审批记录与资产类型） -->
+ <select id="selectApplicationStoragePage" resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO">
+ SELECT
+ oas.id AS id,
+ aaa.dept_name AS deptName,
+ aaa.application_code AS applicationCode,
+ oas.title AS title,
+ CASE WHEN at2.level = 2 THEN at1.type_name ELSE at2.type_name END AS firstAssetTypeName,
+ CASE WHEN at2.level = 2 THEN at2.type_name ELSE NULL END AS secondAssetTypeName,
+ aaa.applicant_name AS applicantName,
+ oas.storage_time AS storageTime,
+ oas.storage_type AS storageType,
+ aaa.approval_status AS approvalStatus
+ FROM oa_approval_application_storage oas
+ INNER JOIN oa_approval_applications aaa ON aaa.id = oas.approval_application_id
+ LEFT JOIN asset_type at2 ON at2.id = oas.asset_type_id
+ LEFT JOIN asset_type at1 ON at1.id = (CASE WHEN at2.level = 2 THEN at2.parent_id ELSE at2.id END)
+ <where>
+ AND aaa.disabled = 0
+ <if test="query != null and query.keyword != null and query.keyword != ''">
+ AND (
+ oas.title LIKE CONCAT('%', #{query.keyword}, '%')
+ OR aaa.application_code LIKE CONCAT('%', #{query.keyword}, '%')
+ OR aaa.dept_name LIKE CONCAT('%', #{query.keyword}, '%')
+ )
+ </if>
+ </where>
+ ORDER BY oas.storage_time DESC, oas.id DESC
+ </select>
+
</mapper>
--
Gitblit v1.7.1