From 99c61e2e4c5aabe594ff8a463a45f3a6b5cb9add Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 17:55:58 +0800
Subject: [PATCH] feat: 调整
---
src/main/resources/mapper/approve/ApproveProcessMapper.xml | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 33b29a9..070a228 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -28,15 +28,33 @@
approve_delete,tenant_id,approve_type,approve_remark
</sql>
<select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess">
- select * from approve_process where approve_delete = 0
- <if test="req.approveId != null and req.approveId != ''">
- and approve_id like concat('%',#{req.approveId},'%')
+ <if test="req.approveType != null and req.approveType == 7">
+ select ap.*,
+ SUBSTRING_INDEX(SUBSTRING_INDEX(ap.approve_reason, '閿�鍞崟鍙�:', -1), '\n', 1) as salesContractNo
+ from approve_process ap
+ where ap.approve_delete = 0
+ <if test="req.approveId != null and req.approveId != ''">
+ and ap.approve_id like concat('%',#{req.approveId},'%')
+ </if>
+ <if test="req.approveStatus != null or req.approveStatus == 0">
+ and ap.approve_status = #{req.approveStatus}
+ </if>
+ and ap.approve_type = #{req.approveType}
+ <if test="req.salesContractNo != null and req.salesContractNo != ''">
+ and ap.approve_reason like concat('%閿�鍞崟鍙�:',#{req.salesContractNo},'%')
+ </if>
</if>
- <if test="req.approveStatus != null or req.approveStatus == 0">
- and approve_status = #{req.approveStatus}
- </if>
- <if test="req.approveType != null ">
- and approve_type = #{req.approveType}
+ <if test="req.approveType == null or req.approveType != 7">
+ select * from approve_process ap where ap.approve_delete = 0
+ <if test="req.approveId != null and req.approveId != ''">
+ and ap.approve_id like concat('%',#{req.approveId},'%')
+ </if>
+ <if test="req.approveStatus != null or req.approveStatus == 0">
+ and ap.approve_status = #{req.approveStatus}
+ </if>
+ <if test="req.approveType != null ">
+ and ap.approve_type = #{req.approveType}
+ </if>
</if>
</select>
</mapper>
--
Gitblit v1.9.3