From 18fb477ea840e3dd4b19ff63f68f994d31fab43b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 21 五月 2024 13:07:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
index ae18ea6..55f68d1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
@@ -5,6 +5,7 @@
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -17,7 +18,12 @@
List<OrderDetail> getOrderReport(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);
- Map<String,Integer> getOrderReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);
+ //type涓轰簡鍖哄埆闇�涓嶉渶瑕佹牴鎹骇鍝佸垎绫�
+ Map<String,Integer> getOrderReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail, String type);
- List<Order> exportOrderReport();
+ List<Order> exportOrderReport(List<LocalDate> dates);
+
+ List<OrderDetail> getOrderProductSummary(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);
+
+ Map<String,Integer> getOrderProductSummaryTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail, String product);
}
--
Gitblit v1.8.0