From 520a6878cf6396625b70918593436bc824103eb4 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:19:54 +0800
Subject: [PATCH] fix: 钱包供应商财务2

---
 src/main/resources/mapper/wallet/WalletBillRecordMapper.xml |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
index ea5b876..b19ed5b 100644
--- a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
@@ -13,6 +13,9 @@
         <result column="supplier_id" property="supplierId" />
         <result column="wallet_id" property="walletId" />
         <result column="type" property="type" />
+
+        <result column="withdraw_type" property="withdrawType" />
+
         <result column="type_detail" property="typeDetail" />
         <result column="transfer_id" property="transferId" />
         <result column="method" property="method" />
@@ -35,7 +38,23 @@
         <if test="dto.endDate != null">
             and DATE_FORMAT(wbr.create_time, '%Y-%m-%d') &lt;= #{dto.endDate}
         </if>
+        order by wbr.create_time asc
+    </select>
 
+    <select id="getPageByDesc" 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>
+        order by wbr.create_time desc
     </select>
     <select id="queryPage" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
         select t.* ,s.name supplierName ,w.approve_time as approveTime  from t_wallet_bill_record t
@@ -66,7 +85,7 @@
         <if test="dto.approveEndDate!=null ">
             AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &lt;= #{dto.approveEndDate}
         </if>
-        order by t.create_time
+        order by t.create_time desc
     </select>
 
     <select id="queryWalletBillRecordList" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">

--
Gitblit v1.9.3