From e4fe69941b2dd4582ec0bd82c32b8dfbc30d85b5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 二月 2024 08:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
index 09d1b0b..2877edc 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
@@ -20,11 +20,11 @@
private CustomerMapper customerMapper;
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁
-public Map<String, List<Object>> getOrderBasicData() {
+ public Map<String, List<Object>> getOrderBasicData() {
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁绫诲瀷
- List<String> orderBasicDataType = basicDateMapper.getOrderBasicDataType();
+ List<String> orderBasicDataType = basicDateMapper.getOrderBasicDataType("order");
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁
- List<BasicData> orderBasicData = basicDateMapper.getOrderBasicData();
+ List<BasicData> orderBasicData = basicDateMapper.getOrderBasicData("order");
//鍒涘缓Map瀵硅薄
Map<String, List<Object>> orderBasicDataMap = new HashMap<>(); ;
//鍒涘缓List瀵硅薄
@@ -53,4 +53,30 @@
//杩斿洖Map瀵硅薄
return orderBasicDataMap;
}
+
+ //鑾峰彇鍙戣揣鍩烘湰鏁版嵁
+ public Map<String, List<Object>> getDeliveryBasicData() {
+ //鑾峰彇璁㈠崟鍩烘湰鏁版嵁绫诲瀷
+ List<String> deliveryBasicDataType = basicDateMapper.getOrderBasicDataType("delivery");
+ //鑾峰彇璁㈠崟鍩烘湰鏁版嵁
+ List<BasicData> deliveryBasicData = basicDateMapper.getOrderBasicData("delivery");
+ //鍒涘缓Map瀵硅薄
+ Map<String, List<Object>> deliveryBasicDataMap = new HashMap<>(); ;
+ //鍒涘缓List瀵硅薄
+
+ //閬嶅巻璁㈠崟鍩烘湰鏁版嵁绫诲瀷
+ for(String item :deliveryBasicDataType){
+ List<Object> orderBasicDataList = new ArrayList<>();
+ //灏嗙被鍨嬪拰List瀵硅薄鏀惧叆Map涓�
+ deliveryBasicDataMap.put(item,orderBasicDataList);
+ }
+ //閬嶅巻璁㈠崟鍩烘湰鏁版嵁
+ for (BasicData item : deliveryBasicData){
+ //灏嗘暟鎹斁鍏ist涓�
+ deliveryBasicDataMap.get(item.getBasicCategory()).add(item);
+ }
+
+ //杩斿洖Map瀵硅薄
+ return deliveryBasicDataMap;
+ }
}
--
Gitblit v1.8.0