From 4537f8e46508fbe3627fe916ada90ebc7d281a7e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 12 十一月 2024 17:25:00 +0800
Subject: [PATCH] add:553-结算列表增加导出表格功能

---
 src/main/resources/mapper/payment/OrderMapper.xml |   50 ++++++++++++++++++++++++++++----------------------
 1 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 5e6e22a..de52af6 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -35,17 +35,23 @@
         <if test="condition.statusBackend != null and condition.statusBackend != ''">
             AND q.status_backend = #{condition.statusBackend}
         </if>
-        <if test="condition.startDate != null">
-            AND q.payment_time &gt;= #{condition.startDate}
-        </if>
-        <if test="condition.endDate != null">
-            AND q.payment_time &lt;= #{condition.endDate}
-        </if>
+<!--        <if test="condition.startDate != null">-->
+<!--            AND q.payment_time &gt;= #{condition.startDate}-->
+<!--        </if>-->
+<!--        <if test="condition.endDate != null">-->
+<!--            AND q.payment_time &lt;= #{condition.endDate}-->
+<!--        </if>-->
+<!--        <if test="condition.createStartDate != null">-->
+<!--            AND q.create_time &gt;= #{condition.createStartDate}-->
+<!--        </if>-->
+<!--        <if test="condition.createEndDate != null">-->
+<!--            AND q.create_time &lt;= #{condition.createEndDate}-->
+<!--        </if>-->
         <if test="condition.createStartDate != null">
-            AND q.create_time &gt;= #{condition.createStartDate}
+            AND q.payment_time &gt;= #{condition.createStartDate}
         </if>
         <if test="condition.createEndDate != null">
-            AND q.create_time &lt;= #{condition.createEndDate}
+            AND q.payment_time &lt;= #{condition.createEndDate}
         </if>
         <if test="condition.partnerId != null">
             AND q.partner_id = #{condition.partnerId}
@@ -108,12 +114,12 @@
         <if test="condition.statusBackend != null and condition.statusBackend != ''">
             AND q.status_backend = #{condition.statusBackend}
         </if>
-        <if test="condition.startDate != null">
-            AND q.payment_time &gt;= #{condition.startDate}
-        </if>
-        <if test="condition.endDate != null">
-            AND q.payment_time &lt;= #{condition.endDate}
-        </if>
+<!--        <if test="condition.startDate != null">-->
+<!--            AND q.payment_time &gt;= #{condition.startDate}-->
+<!--        </if>-->
+<!--        <if test="condition.endDate != null">-->
+<!--            AND q.payment_time &lt;= #{condition.endDate}-->
+<!--        </if>-->
 <!--        <if test="condition.createStartDate != null">-->
 <!--            AND q.create_time &gt;= #{condition.createStartDate}-->
 <!--        </if>-->
@@ -183,18 +189,18 @@
         <if test="condition.statusBackend != null and condition.statusBackend != ''">
             AND q.status_backend = #{condition.statusBackend}
         </if>
-        <if test="condition.startDate != null">
-            AND q.payment_time &gt;= #{condition.startDate}
-        </if>
-        <if test="condition.endDate != null">
-            AND q.payment_time &lt;= #{condition.endDate}
-        </if>
         <if test="condition.createStartDate != null">
-            AND q.create_time &gt;= #{condition.createStartDate}
+            AND q.payment_time &gt;= #{condition.createStartDate}
         </if>
         <if test="condition.createEndDate != null">
-            AND q.create_time &lt;= #{condition.createEndDate}
+            AND q.payment_time &lt;= #{condition.createEndDate}
         </if>
+<!--        <if test="condition.createStartDate != null">-->
+<!--            AND q.create_time &gt;= #{condition.createStartDate}-->
+<!--        </if>-->
+<!--        <if test="condition.createEndDate != null">-->
+<!--            AND q.create_time &lt;= #{condition.createEndDate}-->
+<!--        </if>-->
         <if test="condition.partnerId != null">
             AND q.partner_id = #{condition.partnerId}
         </if>

--
Gitblit v1.9.3