From 617cac9aab814b33a4a0947d7222eae1098028ca Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 28 十月 2024 16:33:52 +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/WalletBillRecordMapper.xml |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
index a38744c..676d23e 100644
--- a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
@@ -22,6 +22,21 @@
         <result column="transfer_detail_id" property="transferDetailId" />
         <result column="open_id" property="openId" />
     </resultMap>
+    <select id="getPage" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
+        select *
+        from t_wallet_bill_record wbr
+        where wbr.DELETED=0
+        <if test="dto.supplierId != null and dto.supplierId != ''">
+            and wbr.supplier_id= #{dto.supplierId}
+        </if>
+        <if test="dto.startDate != null">
+            and DATE_FORMAT(wbr.create_time, '%Y-%m-%d') &gt;= #{dto.startDate}
+        </if>
+        <if test="dto.endDate != null">
+            and DATE_FORMAT(wbr.create_time, '%Y-%m-%d') &lt;= #{dto.endDate}
+        </if>
+
+    </select>
     <select id="queryPage" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
         select t.* ,s.name supplierName from t_wallet_bill_record t
         left join t_supplier_info s on t.supplier_id = s.id

--
Gitblit v1.9.3