From 910368631fee14189845f5969e883ff7a7569191 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 20 五月 2024 13:06:01 +0800
Subject: [PATCH] 订单根据产品分组报表程序

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 4b263ee..83830b8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -14,7 +14,6 @@
 import com.example.erp.exception.ServiceException;
 import com.example.erp.mapper.sd.*;
 import com.example.erp.service.userInfo.SysErrorService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -303,7 +302,7 @@
 
         Map<String,Object> map = new HashMap<>();
         map.put("data",orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail));
-        map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail));
+        map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail,"order"));
         List<String> list = new ArrayList<>();
         list.add(startDate);
         list.add(endDate);
@@ -331,7 +330,7 @@
 
         Map<String,Object> map = new HashMap<>();
         map.put("data",orderDetailMapper.getOrderProductSummary(offset, pageSize, startDate, endDate, orderDetail));
-        map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail));
+        map.put("total",orderDetailMapper.getOrderProductSummaryTotal(offset, pageSize, startDate, endDate, orderDetail, "product"));
         List<String> list = new ArrayList<>();
         list.add(startDate);
         list.add(endDate);

--
Gitblit v1.8.0