From c758c4e55d74a34902dac5752ff4f160118b19bc Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 23 九月 2025 14:09:36 +0800
Subject: [PATCH] 资产借用接口
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
index 4f1cd2e..c6ead5d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
@@ -20,9 +20,9 @@
</sql>
<!-- 分页查询：资产领用申请列表（关联审批记录与资产类型） -->
- <select id="selectReceivePage" resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO">
+ <select id="getPageByType" resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO">
SELECT
- oaa.id AS id,
+ aaa.id AS id,
aaa.application_code AS applicationCode,
oaa.title AS title,
aaa.dept_name AS deptName,
@@ -31,13 +31,14 @@
CASE WHEN at2.level = 2 THEN at2.type_name ELSE NULL END AS secondAssetTypeName,
oaa.operate_time AS operateTime,
aaa.approval_status AS approvalStatus
+ oaa.return_status AS returnStatus
FROM oa_approval_application_asset oaa
INNER JOIN oa_approval_applications aaa ON aaa.id = oaa.approval_application_id
LEFT JOIN asset_type at2 ON at2.id = oaa.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
- AND oaa.type = 0
+ AND oaa.type = #{query.type}
<if test="query != null and query.keyword != null and query.keyword != ''">
AND (
oaa.title LIKE CONCAT('%', #{query.keyword}, '%')
--
Gitblit v1.7.1