From 41631eec06251ec8f858765af6a0858b180e720d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 22 二月 2024 08:22:56 +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 | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 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..595abae 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,26 +20,13 @@
private CustomerMapper customerMapper;
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁
-public Map<String, List<Object>> getOrderBasicData() {
+ public Map<String, List<Object>> getOrderBasicData() {
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁绫诲瀷
- List<String> orderBasicDataType = basicDateMapper.getOrderBasicDataType();
- //鑾峰彇璁㈠崟鍩烘湰鏁版嵁
- List<BasicData> orderBasicData = basicDateMapper.getOrderBasicData();
//鍒涘缓Map瀵硅薄
Map<String, List<Object>> orderBasicDataMap = new HashMap<>(); ;
//鍒涘缓List瀵硅薄
+ orderBasicDataMap = getBasicDataByType("order");
- //閬嶅巻璁㈠崟鍩烘湰鏁版嵁绫诲瀷
- for(String item :orderBasicDataType){
- List<Object> orderBasicDataList = new ArrayList<>();
- //灏嗙被鍨嬪拰List瀵硅薄鏀惧叆Map涓�
- orderBasicDataMap.put(item,orderBasicDataList);
- }
- //閬嶅巻璁㈠崟鍩烘湰鏁版嵁
- for (BasicData item : orderBasicData){
- //灏嗘暟鎹斁鍏ist涓�
- orderBasicDataMap.get(item.getBasicCategory()).add(item);
- }
//鑾峰彇瀹㈡埛鍒楄〃
List<Object> orderBasicDataList = new ArrayList<>();
@@ -53,4 +40,46 @@
//杩斿洖Map瀵硅薄
return orderBasicDataMap;
}
+
+// public Map<String, List<Object>> getBasicDataByType(String type) {
+// List<String> orderBasicDataType = basicDateMapper.getOrderBasicDataType(type);
+// //鑾峰彇璁㈠崟鍩烘湰鏁版嵁
+// List<BasicData> orderBasicData = basicDateMapper.getOrderBasicData(type);
+// //鍒涘缓Map瀵硅薄
+// Map<String, List<Object>> orderBasicDataMap = new HashMap<>(); ;
+// //鍒涘缓List瀵硅薄
+//
+// //閬嶅巻璁㈠崟鍩烘湰鏁版嵁绫诲瀷
+// for(String item :orderBasicDataType){
+// List<Object> orderBasicDataList = new ArrayList<>();
+// //灏嗙被鍨嬪拰List瀵硅薄鏀惧叆Map涓�
+// orderBasicDataMap.put(item,orderBasicDataList);
+// }
+// //閬嶅巻璁㈠崟鍩烘湰鏁版嵁
+// for (BasicData item : orderBasicData){
+// //灏嗘暟鎹斁鍏ist涓�
+// orderBasicDataMap.get(item.getBasicCategory()).add(item);
+// }
+// return orderBasicDataMap;
+// }
+
+ public Map<String, List<Object>> getBasicDataByType(String type){
+ List<String> orderBasicDataType = basicDateMapper.getOrderBasicDataType(type);
+ List<BasicData> orderBasicData = basicDateMapper.getOrderBasicData(type);
+ Map<String, List<Object>> BasicDataMap = new HashMap<>(); ;
+ //鍒涘缓List瀵硅薄
+
+ //閬嶅巻璁㈠崟鍩烘湰鏁版嵁绫诲瀷
+ for(String item :orderBasicDataType){
+ List<Object> orderBasicDataList = new ArrayList<>();
+ //灏嗙被鍨嬪拰List瀵硅薄鏀惧叆Map涓�
+ BasicDataMap.put(item,orderBasicDataList);
+ }
+ //閬嶅巻璁㈠崟鍩烘湰鏁版嵁
+ for (BasicData item : orderBasicData){
+ //灏嗘暟鎹斁鍏ist涓�
+ BasicDataMap.get(item.getBasicCategory()).add(item);
+ }
+ return BasicDataMap;
+ }
}
--
Gitblit v1.8.0