From 0f148ab371926582eeb2774904af5de6dc9e5761 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 16:32:42 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
index 26d83a4..ca3f42d 100644
--- a/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
@@ -30,24 +30,27 @@
<if test="dto.supplierId != null and dto.supplierId != ''">
and t.supplier_id = #{dto.supplierId}
</if>
+ <if test="dto.withdrawState != null and dto.withdrawState != ''">
+ and t.withdraw_state = #{dto.withdrawState}
+ </if>
<if test="dto.createStartDate!=null ">
<![CDATA[
- AND t.create_time >= #{dto.createStartDate}
+ AND t.create_time >= #{dto.createStartDate}
]]>
</if>
<if test="dto.endEndDate!=null ">
<![CDATA[
- AND t.create_time <= #{dto.endEndDate}
+ AND t.create_time <= #{dto.endEndDate}
]]>
</if>
<if test="dto.approveStartDate!=null ">
<![CDATA[
- AND t.approve_time >= #{dto.approveStartDate}
+ AND t.approve_time >= #{dto.approveStartDate}
]]>
</if>
<if test="dto.approveEndDate!=null ">
<![CDATA[
- AND t.approve_time <= #{dto.approveStartDate}
+ AND t.approve_time <= #{dto.approveStartDate}
]]>
</if>
--
Gitblit v1.9.3