From d7819bb819cd897d5933ac98bdec7e3ccc70846c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 10:55:24 +0800
Subject: [PATCH] fix: 冲突
---
src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
index 324735e..26d83a4 100644
--- a/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
@@ -20,5 +20,38 @@
<result column="approve_state" property="approveState" />
<result column="reject_reason" property="rejectReason" />
</resultMap>
+ <select id="queryPage" resultType="com.mzl.flower.dto.response.wallet.WalletWithdrawRecordVO">
+ select t.* ,s.name supplierName from t_wallet_withdraw_record t
+ left join t_supplier_info s on t.supplier_id = s.id
+ where t.deleted= 0
+ <if test="dto.supplierName != null and dto.supplierName != ''">
+ and s.name like concat('%', #{dto.supplierName}, '%')
+ </if>
+ <if test="dto.supplierId != null and dto.supplierId != ''">
+ and t.supplier_id = #{dto.supplierId}
+ </if>
+ <if test="dto.createStartDate!=null ">
+ <![CDATA[
+ AND t.create_time >= #{dto.createStartDate}
+ ]]>
+ </if>
+ <if test="dto.endEndDate!=null ">
+ <![CDATA[
+ AND t.create_time <= #{dto.endEndDate}
+ ]]>
+ </if>
+ <if test="dto.approveStartDate!=null ">
+ <![CDATA[
+ AND t.approve_time >= #{dto.approveStartDate}
+ ]]>
+ </if>
+ <if test="dto.approveEndDate!=null ">
+ <![CDATA[
+ AND t.approve_time <= #{dto.approveStartDate}
+ ]]>
+ </if>
+
+ order by t.create_time
+ </select>
</mapper>
--
Gitblit v1.9.3