From 9398b7743fa976b016dfbb2b9cf4a04db340508e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 十月 2025 11:56:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationChangeMapper.xml | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationChangeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationChangeMapper.xml
index df95262..e423268 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationChangeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationChangeMapper.xml
@@ -20,4 +20,38 @@
id, approval_application_id, title, asset_type_id, change_time, ownership_dept_id, warehouse_id, address, user_name
</sql>
+ <!-- 分页查询资产变更申请列表 -->
+ <select id="selectChangePage" resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationChangePageVO">
+ SELECT
+ app.id,
+ app.application_code AS applicationCode,
+ oaac.title,
+ d.dept_name AS deptName,
+ u.nick_name AS applicantName,
+ app.application_reason AS applicationReason,
+ app.application_date AS applicationDate,
+ app.approval_status AS approvalStatus,
+ CASE app.approval_status
+ WHEN 0 THEN '待审核'
+ WHEN 1 THEN '审核中'
+ WHEN 2 THEN '已通过'
+ WHEN 3 THEN '已拒绝'
+ ELSE '未知'
+ END AS approvalStatusName
+ FROM oa_approval_applications app
+ INNER JOIN oa_approval_application_change oaac ON app.id = oaac.approval_application_id
+ LEFT JOIN sys_user u ON app.applicant_user_id = u.user_id
+ LEFT JOIN t_dept d ON app.dept_id = d.id
+ WHERE app.disabled = 0
+ AND app.approval_id = '${@com.ruoyi.system.emums.ApprovalTypeEnum@ASSET_CHANGE.getCode()}'
+ <if test="query.keyword != null and query.keyword != ''">
+ AND (oaac.title LIKE CONCAT('%', #{query.keyword}, '%')
+ OR app.application_code LIKE CONCAT('%', #{query.keyword}, '%'))
+ </if>
+ <if test="query.deptId != null">
+ AND (d.id = #{query.deptId} OR FIND_IN_SET(#{query.deptId}, d.parent_id))
+ </if>
+ ORDER BY app.create_time DESC
+ </select>
+
</mapper>
--
Gitblit v1.7.1