From c7d127ae867c00f01a7eb4977836565bcae6ee9f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 十二月 2024 11:29:56 +0800
Subject: [PATCH] 1.财务报表-部分统计字段新增 2.合伙人报表-部分统计字段新增

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

diff --git a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
index e679dc7..2a91ac6 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
@@ -24,10 +24,10 @@
 <!--            AND q.create_time &lt;= #{condition.endDate}-->
 <!--        </if>-->
         <if test="condition.startDate != null">
-            AND o.payment_time &gt; #{condition.startDate}
+            AND o.payment_time &gt;= #{condition.startDate}
         </if>
         <if test="condition.endDate != null">
-            AND o.payment_time &lt;= #{condition.endDate}
+            AND o.payment_time &lt; #{condition.endDate}
         </if>
         ORDER BY o.payment_time
     </select>
@@ -143,10 +143,10 @@
 <!--            AND q.create_time &lt;= #{condition.endDate}-->
 <!--        </if>-->
         <if test="condition.startDate != null">
-            AND o.payment_time &gt; #{condition.startDate}
+            AND o.payment_time &gt;= #{condition.startDate}
         </if>
         <if test="condition.endDate != null">
-            AND o.payment_time &lt;= #{condition.endDate}
+            AND o.payment_time &lt; #{condition.endDate}
         </if>
         ) tt
         GROUP BY tt.id, tt.supplierName, tt.supplierTel, tt.stationName
@@ -196,10 +196,10 @@
 <!--            AND q.create_time &lt;= #{condition.endDate}-->
 <!--        </if>-->
         <if test="condition.startDate != null">
-            AND o.payment_time &gt; #{condition.startDate}
+            AND o.payment_time &gt;= #{condition.startDate}
         </if>
         <if test="condition.endDate != null">
-            AND o.payment_time &lt;= #{condition.endDate}
+            AND o.payment_time &lt; #{condition.endDate}
         </if>
 
         ORDER BY q.arrive_time
@@ -238,10 +238,10 @@
 <!--            AND o.create_time &lt;= #{endDate}-->
 <!--        </if>-->
         <if test="startDate != null">
-            AND t.payment_time &gt; #{startDate}
+            AND t.payment_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            AND t.payment_time &lt;= #{endDate}
+            AND t.payment_time &lt; #{endDate}
         </if>
 
         <if test="statusList != null and statusList.size > 0">

--
Gitblit v1.9.3