From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 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 86491f8..f94fa7d 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" >
@@ -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,20 @@
         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="countByCustomerName">
+        SELECT COUNT(*)
+        FROM sd.customer
+        WHERE customer_name=#{customer.customerName}
+    </select>
+
     <select id="getSelectCustomer">
         select
             *
@@ -242,7 +260,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
 
@@ -267,6 +285,7 @@
           and date(d.create_time) &lt;= #{endDate}
           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
@@ -306,7 +325,7 @@
         where date(o.create_time) >= #{startDate}
           and date(o.create_time) &lt;= #{endDate}
           and o.customer_id = #{orderDetail.order.customerId}
-          and o.create_order>0
+          and o.order_review>0
         group by od.order_id,od.product_id
 
         UNION ALL
@@ -326,7 +345,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