From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml |   55 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 9 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 2ac0274..35022ef 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -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.order_id,od.product_id
+        group by dd.delivery_id,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.order_id,od.product_id) as zu
+        group by dd.delivery_id,od.order_id,od.product_id) as zu
     </select>
 
     <select id="getSelectCustomerOderDate" >
@@ -77,7 +77,7 @@
         o.customer_id,
         o.customer_name,
         sum(od.quantity) as quantity,
-        sum(od.area) as area,
+        sum(od.compute_gross_area) as area,
         od.shape,
         od.width,
         od.height,
@@ -91,7 +91,7 @@
         left join `order` o on o.order_id = od.order_id
         <where>
             and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
-                                   and o.customer_id = #{orderDetail.order.customerId}
+                                   and o.customer_id = #{orderDetail.order.customerId} and o.create_order>0
         </where>
         group by od.order_id,od.product_id
         limit #{offset},#{pageSize};
@@ -105,7 +105,7 @@
         left join `order` o on o.order_id = od.order_id
         <where>
             and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
-                and o.customer_id = #{orderDetail.order.customerId}
+                and o.customer_id = #{orderDetail.order.customerId} and o.create_order>0
         </where>
         group by od.order_id,od.product_id) as zu
     </select>
@@ -115,7 +115,9 @@
             a.*,
             b.project,
             b.salesman_id,
-            b.salesman
+            b.salesman,
+            b.contacts,
+            b.contact_number
         from
             sd.customer as a
         left join (SELECT
@@ -128,6 +130,8 @@
                                o.project,
                                o.salesman_id,
                                o.salesman,
+                               o.contacts,
+                               o.contact_number,
                                o.customer_id
                            FROM
                                sd.ORDER AS o
@@ -137,6 +141,14 @@
         on a.id = b.customer_id
 
     </select>
+    <select id="getProjectList">
+        select * from(select project,salesman_id as salesmanId,salesman,contacts,contact_number as contactNumber,id from sd.`order`
+                       where customer_id = #{id}
+                      group by project
+                       ) as a
+              order by id desc
+    </select>
+
     <select id="getSelectCustomer">
         select
             *
@@ -242,7 +254,7 @@
         where date(d.create_time) >= #{startDate}
           and date(d.create_time) &lt;= #{endDate}
           and d.customer_id = #{orderDetail.order.customerId}
-        group by od.order_id,od.product_id
+        group by dd.delivery_id,od.order_id,od.product_id
 
         UNION ALL
 
@@ -265,9 +277,31 @@
 
         where date(d.create_time) >= #{startDate}
           and date(d.create_time) &lt;= #{endDate}
-          and d.customer_id = 1855
+          and d.customer_id = #{orderDetail.order.customerId}
           and om.money is not null
+          and om.money >0
         group by d.delivery_id, o.order_id, om.`column`
+
+        UNION ALL
+
+        select d.delivery_id,
+               d.order_id,
+               d.customer_name,
+               d.project,
+               '杩愯垂'           as product_name,
+               d.freight_quantity    as quantity,
+               0                   as area,
+               d.freight_price    as price,
+               d.freight        as money,
+               date(d.create_time) as create_time
+
+        from sd.delivery d
+
+        where date(d.create_time) >= #{startDate}
+          and date(d.create_time) &lt;= #{endDate}
+          and d.customer_id = #{orderDetail.order.customerId}
+          and d.freight >0
+        group by d.delivery_id
     </select>
 
     <select id="exportSelectCustomerOderDate" >
@@ -276,7 +310,7 @@
                od.product_name,
                o.customer_name,
                sum(od.quantity)     as quantity,
-               sum(od.area)         as area,
+               sum(od.compute_gross_area)         as area,
                od.price,
                sum(od.gross_amount) as money,
                date(o.create_time)  as create_time
@@ -285,6 +319,7 @@
         where date(o.create_time) >= #{startDate}
           and date(o.create_time) &lt;= #{endDate}
           and o.customer_id = #{orderDetail.order.customerId}
+          and o.order_review>0
         group by od.order_id,od.product_id
 
         UNION ALL
@@ -304,7 +339,9 @@
         where date(o.create_time) >= #{startDate}
           and date(o.create_time) &lt;= #{endDate}
           and o.customer_id = #{orderDetail.order.customerId}
+          and o.order_review>0
           and om.money is not null
+          and om.money >0
         group by o.order_id, om.`column`
 
     </select>

--
Gitblit v1.8.0