From d8085c81987d5819d7f270bcf0bd68d879f28d2b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 13 三月 2024 10:30:47 +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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 595abae..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
@@ -64,9 +64,11 @@
// }
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<>(); ;
+ Map<String, List<Object>> BasicDataMap = new HashMap<>();
//鍒涘缓List瀵硅薄
//閬嶅巻璁㈠崟鍩烘湰鏁版嵁绫诲瀷
@@ -82,4 +84,10 @@
}
return BasicDataMap;
}
+
+ public List<BasicData> getBasicDataByTypeAndChildType(String type, String childType) {
+ Map<String, List<Object>> BasicDataMap = new HashMap<>();
+ return basicDateMapper.getOrderBasicDataByTypeAndChildType(type, childType);
+
+ }
}
--
Gitblit v1.8.0