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/DeliveryService.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 7512cc8..6c745c4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -968,4 +968,27 @@
}
+ public Object appGetDeliveryList(List<String> 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<String> date = new ArrayList<>();
+ date.add(startDate);
+ date.add(endDate);
+
+ List<Delivery> deliveryList = deliveryMapper.selectByDate(startDate, endDate);
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",deliveryList);
+ map.put("date",date);
+
+ return map;
+ }
}
--
Gitblit v1.8.0