From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 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..d1a3706 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) <= #{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) <= #{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" >
@@ -242,7 +242,7 @@
where date(d.create_time) >= #{startDate}
and date(d.create_time) <= #{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
--
Gitblit v1.8.0