From 6305d0c86c23e9a583e8ca798645885d167f4dc5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 10 六月 2026 17:20:58 +0800
Subject: [PATCH] feat:1.销售台账导出按照查询条件 2.导出订单和产品明细
---
src/main/resources/mapper/approve/ApproveProcessMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 995ae0c..f60d132 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -27,13 +27,18 @@
approve_user_names,approve_reason,approve_time,approve_over_time,approve_status,
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>
- <if test="req.approveStatus != null and req.approveStatus != ''">
+ <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>
+ order by approve_time desc
</select>
</mapper>
--
Gitblit v1.9.3