From 0294300e78c5e816d7b6ad06ab0fac7a263363eb Mon Sep 17 00:00:00 2001 From: 廖井涛 <2265517004@qq.com> Date: 星期二, 27 二月 2024 18:03:59 +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 | 8 +++++++- 1 files changed, 7 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..7deef2a 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 @@ -66,7 +66,7 @@ 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 +82,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