From 7f54cffaf13d9fc48f415a89c63950f526b3e06d Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 21 十一月 2025 11:35:03 +0800
Subject: [PATCH] 修改前端展示信息来源，优化数据来源由原来的数据库改为前端表格数据
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 7 ++++---
1 files changed, 4 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 08fb026..7a52023 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
@@ -587,7 +587,7 @@
public Map<String,Object> getOrderReport(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail, Integer model, Integer scope) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
- String startDate = LocalDate.now().minusDays(15).toString();
+ String startDate = LocalDate.now().minusDays(30).toString();
if(selectDate !=null && selectDate.size()==2){
if(!selectDate.get(0).isEmpty()){
startDate = selectDate.get(0);
@@ -614,7 +614,7 @@
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();
+ String startDate = LocalDate.now().minusDays(30).toString();
if(selectDate !=null && selectDate.size()==2){
if(!selectDate.get(0).isEmpty()){
startDate = selectDate.get(0);
@@ -642,7 +642,7 @@
public Map<String,Object> getOrderProductSummary(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
- String startDate = LocalDate.now().minusDays(15).toString();
+ String startDate = LocalDate.now().minusDays(30).toString();
if(selectDate !=null && selectDate.size()==2){
if(!selectDate.get(0).isEmpty()){
startDate = selectDate.get(0);
@@ -1061,6 +1061,7 @@
totalSum.put("perimeter", df.format(perimeter));
totalSum.put("count", list.size());
+
Map<String,Object> map = new HashMap<>();
map.put("data",list);
map.put("date",date);
--
Gitblit v1.8.0