From f85651f863363b7f494f421301de9d02e0ae79ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 11 十一月 2024 12:49:33 +0800
Subject: [PATCH] fix:调整花农结算报表订单状态；查询时间无效

---
 src/main/resources/mapper/payment/DeliveryOrderMapper.xml |   40 ++++++++++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
index 7af2ae0..e679dc7 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
@@ -17,11 +17,17 @@
                 #{item}
             </foreach>
         </if>
+<!--        <if test="condition.startDate != null">-->
+<!--            AND q.create_time &gt; #{condition.startDate}-->
+<!--        </if>-->
+<!--        <if test="condition.endDate != null">-->
+<!--            AND q.create_time &lt;= #{condition.endDate}-->
+<!--        </if>-->
         <if test="condition.startDate != null">
-            AND q.create_time &gt; #{condition.startDate}
+            AND o.payment_time &gt; #{condition.startDate}
         </if>
         <if test="condition.endDate != null">
-            AND q.create_time &lt;= #{condition.endDate}
+            AND o.payment_time &lt;= #{condition.endDate}
         </if>
         ORDER BY o.payment_time
     </select>
@@ -130,11 +136,17 @@
             AND o.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
         </if>
 
+<!--        <if test="condition.startDate != null">-->
+<!--            AND q.create_time &gt; #{condition.startDate}-->
+<!--        </if>-->
+<!--        <if test="condition.endDate != null">-->
+<!--            AND q.create_time &lt;= #{condition.endDate}-->
+<!--        </if>-->
         <if test="condition.startDate != null">
-            AND q.create_time &gt; #{condition.startDate}
+            AND o.payment_time &gt; #{condition.startDate}
         </if>
         <if test="condition.endDate != null">
-            AND q.create_time &lt;= #{condition.endDate}
+            AND o.payment_time &lt;= #{condition.endDate}
         </if>
         ) tt
         GROUP BY tt.id, tt.supplierName, tt.supplierTel, tt.stationName
@@ -177,11 +189,17 @@
             AND o.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
         </if>
 
+<!--        <if test="condition.startDate != null">-->
+<!--            AND q.create_time &gt; #{condition.startDate}-->
+<!--        </if>-->
+<!--        <if test="condition.endDate != null">-->
+<!--            AND q.create_time &lt;= #{condition.endDate}-->
+<!--        </if>-->
         <if test="condition.startDate != null">
-            AND q.create_time &gt; #{condition.startDate}
+            AND o.payment_time &gt; #{condition.startDate}
         </if>
         <if test="condition.endDate != null">
-            AND q.create_time &lt;= #{condition.endDate}
+            AND o.payment_time &lt;= #{condition.endDate}
         </if>
 
         ORDER BY q.arrive_time
@@ -213,11 +231,17 @@
             t.warehouse_location_code LIKE concat('%', #{name},'%')
             )
         </if>
+<!--        <if test="startDate != null">-->
+<!--            AND o.create_time &gt; #{startDate}-->
+<!--        </if>-->
+<!--        <if test="endDate != null">-->
+<!--            AND o.create_time &lt;= #{endDate}-->
+<!--        </if>-->
         <if test="startDate != null">
-            AND o.create_time &gt; #{startDate}
+            AND t.payment_time &gt; #{startDate}
         </if>
         <if test="endDate != null">
-            AND o.create_time &lt;= #{endDate}
+            AND t.payment_time &lt;= #{endDate}
         </if>
 
         <if test="statusList != null and statusList.size > 0">

--
Gitblit v1.9.3