From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +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 | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
index 8bb732b..f840ba2 100644
--- a/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
@@ -30,31 +30,23 @@
<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 test="dto.approveState != null and dto.approveState != ''">
+ and t.approve_state = #{dto.approveState}
</if>
<if test="dto.createStartDate!=null ">
- <![CDATA[
AND DATE_FORMAT(t.create_time, '%Y-%m-%d') >= #{dto.createStartDate}
- ]]>
</if>
<if test="dto.endEndDate!=null ">
- <![CDATA[
AND DATE_FORMAT(t.create_time, '%Y-%m-%d') <= #{dto.endEndDate}
- ]]>
</if>
<if test="dto.approveStartDate!=null ">
- <![CDATA[
- AND t.approve_time >= #{dto.approveStartDate}
- ]]>
+ AND DATE_FORMAT(t.approve_time, '%Y-%m-%d') >= #{dto.approveStartDate}
</if>
<if test="dto.approveEndDate!=null ">
- <![CDATA[
- AND t.approve_time <= #{dto.approveStartDate}
- ]]>
+ AND DATE_FORMAT(t.approve_time, '%Y-%m-%d') <= #{dto.approveEndDate}
</if>
- order by t.create_time
+ order by t.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3