From ae3dd677f3bbbc26d7c41aebc0e6048e2d20593c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 十二月 2024 14:58:43 +0800
Subject: [PATCH] 1.花材统计报表：增加父类名称

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

diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index df08bcb..4c89314 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -31,13 +31,20 @@
         FROM t_delivery_order_item doi
         join t_delivery_order q on q.id = doi.delivery_id
         join t_order_item oi on oi.id = doi.order_item_id
+        JOIN t_order o ON q.order_id = o.id
         WHERE q.deleted = 0 and doi.deleted = 0
         and q.supplier_id = #{supplierId}
+<!--        <if test="startDate != null">-->
+<!--            AND q.create_time &gt; #{startDate}-->
+<!--        </if>-->
+<!--        <if test="endDate != null">-->
+<!--            AND q.create_time &lt;= #{endDate}-->
+<!--        </if>-->
         <if test="startDate != null">
-            AND q.create_time &gt; #{startDate}
+            AND o.payment_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            AND q.create_time &lt;= #{endDate}
+            AND o.payment_time &lt; #{endDate}
         </if>
         group by oi.flower_name, oi.flower_level
     </select>
@@ -60,10 +67,10 @@
         WHERE q.deleted = 0 and doi.deleted = 0
         and q.supplier_id = #{supplierId}
         <if test="startDate != null">
-            AND o.payment_time &gt; #{startDate}
+            AND o.payment_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            AND o.payment_time &lt;= #{endDate}
+            AND o.payment_time &lt; #{endDate}
         </if>
         order by q.create_time desc, oi.flower_name, oi.flower_level
     </select>
@@ -74,13 +81,20 @@
         FROM t_delivery_order_item doi
         join t_delivery_order q on q.id = doi.delivery_id
         join t_order_item oi on oi.id = doi.order_item_id
+        JOIN t_order o on oi.order_id=o.id
         WHERE q.deleted = 0 and doi.deleted = 0
         and q.supplier_id = #{supplierId}
+<!--        <if test="startDate != null">-->
+<!--            AND q.create_time &gt; #{startDate}-->
+<!--        </if>-->
+<!--        <if test="endDate != null">-->
+<!--            AND q.create_time &lt;= #{endDate}-->
+<!--        </if>-->
         <if test="startDate != null">
-            AND q.create_time &gt; #{startDate}
+            AND o.payment_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            AND q.create_time &lt;= #{endDate}
+            AND o.payment_time &lt; #{endDate}
         </if>
     </select>
 
@@ -89,16 +103,23 @@
         FROM t_delivery_order_item doi
         join t_delivery_order q on q.id = doi.delivery_id
         join t_order_item oi on oi.id = doi.order_item_id
+        JOIN t_order o on oi.order_id=o.id
         WHERE q.deleted = 0 and doi.deleted = 0
         and q.supplier_id = #{supplierId}
+<!--        <if test="status != null and status != ''">-->
+<!--            AND q.status = #{status}-->
+<!--        </if>-->
+<!--        <if test="startDate != null">-->
+<!--            AND q.create_time &gt; #{startDate}-->
+<!--        </if>-->
         <if test="status != null and status != ''">
             AND q.status = #{status}
         </if>
         <if test="startDate != null">
-            AND q.create_time &gt; #{startDate}
+            AND o.payment_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            AND q.create_time &lt;= #{endDate}
+            AND o.payment_time &lt; #{endDate}
         </if>
     </select>
 

--
Gitblit v1.9.3