From f692a364cdb559ddadc4f6dac86c25848a1d4f34 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 03 十一月 2025 16:54:53 +0800
Subject: [PATCH] 修改订单首页流程卡终止状态，以及自定义标签打印
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 696f099..ff7ea07 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
@@ -29,6 +29,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.sql.SQLOutput;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -1024,7 +1025,8 @@
return true;
}
- public Map<String,Object> appGetOrderList(List<LocalDate> dates) {
+ public Map<String,Object> appGetOrderList(List<String> dates) {
+ //璁剧疆褰撳墠鏃堕棿
String endDate = LocalDate.now().toString();
String startDate = LocalDate.now().minusDays(30).toString();
if(dates !=null && dates.size()==2){
@@ -1035,6 +1037,11 @@
endDate = String.valueOf(dates.get(1));
}
}
+ List<String> date = new ArrayList<>();
+ date.add(startDate);
+ date.add(endDate);
+
+
List<Order> list = orderMapper.selectList(new LambdaQueryWrapper<Order>()
.gt(Order::getCreateOrder,0)
.between(Order::getCreateTime,startDate, endDate)
@@ -1042,8 +1049,8 @@
Map<String,Object> map = new HashMap<>();
map.put("data",list);
+ map.put("date",date);
return map;
- //return orderMapper.
}
}
--
Gitblit v1.8.0