From d20289401001352bb20ca0bd614f4ef3e2c749d0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 06 八月 2024 17:43:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 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 0349177..64f429e 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
@@ -169,6 +169,13 @@
String formattedDate = dateFormat.format(currentDate);
orderId = "NG"+formattedDate+formattedNumber;
+ }else if(dateType.equals("year")){
+ Integer maxOrderId = orderMapper.selectMaxOrderIdByYear();
+ String formattedNumber = String.format("%06d", maxOrderId+1);
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yy");
+ String formattedDate = dateFormat.format(currentDate);
+ orderId = "NG"+formattedDate+formattedNumber;
}
return orderId;
@@ -430,6 +437,34 @@
return orderDetailMapper.exportOrderReport(dates);
}
+ public Map<String,Object> getOrderSummaryReport(Integer pageNum, Integer pageSize, List<String> selectDate, Order order) {
+ Integer offset = (pageNum-1)*pageSize;
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
+
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",orderDetailMapper.getOrderSummaryReport(offset, pageSize, startDate, endDate, order));
+ map.put("total",orderDetailMapper.getOrderSummaryReportTotal(offset, pageSize, startDate, endDate, order,"order"));
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
+// map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
+ return map;
+ }
+
+ public List<Order> exportOrderSummary(List<LocalDate> dates) {
+ return orderDetailMapper.exportOrderSummary(dates);
+ }
+
public Map<String,Object> getOrderProductSummary(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
--
Gitblit v1.8.0