From ab0ac24c86067aaec92a2839280d73c08e458170 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 03 二月 2024 11:46:14 +0800
Subject: [PATCH] 2024.2.3提交sd模块相关代码
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 4f433d7..1cc93d7 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
@@ -138,21 +138,26 @@
}
//鏌ヨ鑾峰彇鍒楄〃
- public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<LocalDate> selectDate, Order order,Integer orderType) {
+ public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<String> selectDate, Order order,Integer orderType) {
Integer offset = (pageNum-1)*pageSize;
- LocalDate endDate = LocalDate.now();
- LocalDate startDate = endDate.minusDays(15);
-
- if(selectDate == null && selectDate.size()==2){
- startDate = selectDate.get(0);
- endDate = selectDate.get(1);
+ 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",orderMapper.getOrderList(offset, pageSize, startDate, endDate, order,orderType));
map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, order,orderType));
- map.put("startDate",startDate);
- map.put("endDate",endDate);
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
}
--
Gitblit v1.8.0