From 5cd9288f8ff95696ebbb88fa9c5a7f0322aeb699 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 28 十月 2025 13:42:31 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/AppController.java | 8 ++++++--
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 23 +++++++++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
index 20c78e3..d46ac0a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
@@ -7,8 +7,12 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.util.List;
@RestController
@RequestMapping("/app")
@@ -19,7 +23,7 @@
@ApiOperation("璁㈠崟鎶ヨ〃")
@PostMapping("/getOrderList")
- public Result getOrderList() {
- return Result.success(orderService.appGetOrderList());
+ public Result getOrderList(@RequestBody List<LocalDate> dates) {
+ return Result.success(orderService.appGetOrderList(dates));
}
}
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 143aec9..696f099 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
@@ -1023,4 +1023,27 @@
}
return true;
}
+
+ public Map<String,Object> appGetOrderList(List<LocalDate> dates) {
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(30).toString();
+ if(dates !=null && dates.size()==2){
+ if(dates.get(0) != null){
+ startDate = String.valueOf(dates.get(0));
+ }
+ if(dates.get(1) != null){
+ endDate = String.valueOf(dates.get(1));
+ }
+ }
+ List<Order> list = orderMapper.selectList(new LambdaQueryWrapper<Order>()
+ .gt(Order::getCreateOrder,0)
+ .between(Order::getCreateTime,startDate, endDate)
+ );
+
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",list);
+
+ return map;
+ //return orderMapper.
+ }
}
--
Gitblit v1.8.0