From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001 From: chenlu <1320612696@qq.com> Date: 星期五, 07 六月 2024 16:56:06 +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 | 74 ++++++++++++++++++++++++++++++++++-- 1 files changed, 69 insertions(+), 5 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 19ce357..9b6ecad 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 @@ -1,23 +1,31 @@ package com.example.erp.service.sd; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.example.erp.entity.sd.BasicData; +import com.example.erp.entity.sd.BasicOtherMoney; import com.example.erp.entity.sd.Customer; import com.example.erp.mapper.sd.BasicDateMapper; +import com.example.erp.mapper.sd.BasicOtherMoneyMapper; import com.example.erp.mapper.sd.CustomerMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.example.erp.entity.sd.BasicData; import java.util.*; @Service @DS("sd") public class BasicDateService { - @Autowired - private BasicDateMapper basicDateMapper; + private final BasicDateMapper basicDateMapper; - @Autowired - private CustomerMapper customerMapper; + private final CustomerMapper customerMapper; + private final BasicOtherMoneyMapper basicOtherMoneyMapper; + + public BasicDateService(BasicDateMapper basicDateMapper, CustomerMapper customerMapper, BasicOtherMoneyMapper basicOtherMoneyMapper) { + this.basicDateMapper = basicDateMapper; + this.customerMapper = customerMapper; + this.basicOtherMoneyMapper = basicOtherMoneyMapper; + } //鑾峰彇璁㈠崟鍩烘湰鏁版嵁 public Map<String, List<Object>> getOrderBasicData() { @@ -35,6 +43,11 @@ for (Customer customer : customerList){ orderBasicDataMap.get("customer").add(customer); } + + orderBasicDataMap.put("orderOtherMoney", + Collections.singletonList( + basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1)) + )); //杩斿洖Map瀵硅薄 @@ -82,6 +95,7 @@ //灏嗘暟鎹斁鍏ist涓� BasicDataMap.get(item.getBasicCategory()).add(item); } + BasicDataMap.put("deliveryOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null))); return BasicDataMap; } @@ -90,4 +104,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