From cc78e409cdca2a414f654490d3bc78cce429c59e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 05 八月 2024 09:13:42 +0800
Subject: [PATCH] 新增订单总报表

---
 north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
index a9fc432..2ac0274 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -41,7 +41,7 @@
 
 
     <select id="getSelectCustomerDeliveryDate" >
-        select d.delivery_id,d.order_id,d.customer_id,d.customer_name,
+        select d.delivery_id,dd.order_id,d.customer_id,d.customer_name,
                d.project,od.product_name,sum(dd.quantity) as quantity,sum(dd.area) as area,dd.price,sum(dd.money) as money,
                 date(d.create_time) as create_time
 
@@ -51,7 +51,7 @@
 
                 where date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
                 and d.customer_id = #{orderDetail.order.customerId}
-        group by od.product_id
+        group by od.order_id,od.product_id
         limit #{offset},#{pageSize};
     </select>
 
@@ -65,7 +65,7 @@
         where
              date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
             and d.customer_id = #{orderDetail.order.customerId}
-        group by od.product_id, od.width, od.height) as zu
+        group by od.order_id,od.product_id) as zu
     </select>
 
     <select id="getSelectCustomerOderDate" >
@@ -93,7 +93,7 @@
             and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
                                    and o.customer_id = #{orderDetail.order.customerId}
         </where>
-        group by od.product_id
+        group by od.order_id,od.product_id
         limit #{offset},#{pageSize};
     </select>
 
@@ -107,7 +107,7 @@
             and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
                 and o.customer_id = #{orderDetail.order.customerId}
         </where>
-        group by od.product_id, od.width, od.height) as zu
+        group by od.order_id,od.product_id) as zu
     </select>
 
     <select id="getCustomerList">
@@ -225,7 +225,7 @@
 
     <select id="exportSelectCustomerDeliveryDate" >
         select d.delivery_id,
-               d.order_id,
+               dd.order_id,
                d.customer_name,
                d.project,
                od.product_name,
@@ -242,7 +242,7 @@
         where date(d.create_time) >= #{startDate}
           and date(d.create_time) &lt;= #{endDate}
           and d.customer_id = #{orderDetail.order.customerId}
-        group by od.product_id
+        group by od.order_id,od.product_id
 
         UNION ALL
 
@@ -285,7 +285,7 @@
         where date(o.create_time) >= #{startDate}
           and date(o.create_time) &lt;= #{endDate}
           and o.customer_id = #{orderDetail.order.customerId}
-        group by od.product_id
+        group by od.order_id,od.product_id
 
         UNION ALL
 

--
Gitblit v1.8.0