From b13c552870d145f287dfd93a502e91cf9efc8ec3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 13 三月 2024 10:05:37 +0800
Subject: [PATCH] 修改界面中英文
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java | 67 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 28 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 2877edc..19ce357 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
@@ -22,24 +22,11 @@
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁
public Map<String, List<Object>> getOrderBasicData() {
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁绫诲瀷
- List<String> orderBasicDataType = basicDateMapper.getOrderBasicDataType("order");
- //鑾峰彇璁㈠崟鍩烘湰鏁版嵁
- List<BasicData> orderBasicData = basicDateMapper.getOrderBasicData("order");
//鍒涘缓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<>();
@@ -54,29 +41,53 @@
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<>(); ;
+// 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 :deliveryBasicDataType){
+ for(String item :orderBasicDataType){
List<Object> orderBasicDataList = new ArrayList<>();
//灏嗙被鍨嬪拰List瀵硅薄鏀惧叆Map涓�
- deliveryBasicDataMap.put(item,orderBasicDataList);
+ BasicDataMap.put(item,orderBasicDataList);
}
//閬嶅巻璁㈠崟鍩烘湰鏁版嵁
- for (BasicData item : deliveryBasicData){
+ for (BasicData item : orderBasicData){
//灏嗘暟鎹斁鍏ist涓�
- deliveryBasicDataMap.get(item.getBasicCategory()).add(item);
+ BasicDataMap.get(item.getBasicCategory()).add(item);
}
+ return BasicDataMap;
+ }
- //杩斿洖Map瀵硅薄
- return deliveryBasicDataMap;
+ public List<BasicData> getBasicDataByTypeAndChildType(String type, String childType) {
+ Map<String, List<Object>> BasicDataMap = new HashMap<>();
+ return basicDateMapper.getOrderBasicDataByTypeAndChildType(type, childType);
+
}
}
--
Gitblit v1.8.0