From 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 29 三月 2024 16:35:41 +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 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 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 7deef2a..d88eddb 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,7 +64,9 @@
// }
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瀵硅薄
@@ -88,4 +90,54 @@
return basicDateMapper.getOrderBasicDataByTypeAndChildType(type, childType);
}
+
+ public List<BasicData> getBasicData() {
+ return basicDateMapper.getBasicData();
+ }
+
+ public Object getBasicDataType() {
+ List<BasicData> lastType = basicDateMapper.getBasicDataLastType();
+ List<BasicData> firstType= basicDateMapper.getBasicDataFirstType();
+ List<Map<String,Object>> list = new ArrayList<>();
+ if(!firstType.isEmpty()){
+ firstType.forEach(item->{
+ Map<String,Object> map = new HashMap<>();
+ List<Map<String,String>> lastTypeList = new ArrayList<>();
+ lastType.forEach(item1->{
+ Map<String,String> map1 = new HashMap<>();
+ if(Objects.equals(item.getBasicType(), item1.getBasicType())){
+ map1.put("value",item1.getBasicCategory());
+ map1.put("label",item1.getBasicCategory());
+ lastTypeList.add(map1);
+ }
+ });
+ map.put("children",lastTypeList);
+ map.put("value",item.getBasicType());
+ map.put("label",item.getBasicType());
+ list.add(map);
+ });
+ }
+ return list;
+ }
+
+ public boolean addBasicData(Map<String, Object> map) {
+ List<String> basicTypeList = (List<String>) map.get("basicType");
+ if(basicTypeList.size()==2){
+ BasicData basicData = new BasicData();
+ basicData.setBasicType(basicTypeList.get(0));
+ basicData.setBasicCategory(basicTypeList.get(1));
+ basicData.setBasicName(map.get("input").toString());
+ basicDateMapper.insert(basicData);
+ }
+ return true;
+ }
+
+ public int deleteBasicData(BasicData basicData) {
+
+ return basicDateMapper.deleteById(basicData.getId());
+ }
+
+ public int updateBasicData(BasicData basicData) {
+ return basicDateMapper.updateById(basicData);
+ }
}
--
Gitblit v1.8.0