From d809ecd16cbb23f5aad86a6844f51ffea0455fe8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java | 142 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 122 insertions(+), 20 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 09d1b0b..963e289 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,45 +1,40 @@
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() {
+ public Map<String, List<Object>> getOrderBasicData() {
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁绫诲瀷
- List<String> orderBasicDataType = basicDateMapper.getOrderBasicDataType();
- //鑾峰彇璁㈠崟鍩烘湰鏁版嵁
- List<BasicData> orderBasicData = basicDateMapper.getOrderBasicData();
//鍒涘缓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<>();
@@ -49,8 +44,115 @@
orderBasicDataMap.get("customer").add(customer);
}
+ orderBasicDataMap.put("orderOtherMoney",
+ Collections.singletonList(
+ basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))
+ ));
+
//杩斿洖Map瀵硅薄
return orderBasicDataMap;
}
+
+// 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 :orderBasicDataType){
+ List<Object> orderBasicDataList = new ArrayList<>();
+ //灏嗙被鍨嬪拰List瀵硅薄鏀惧叆Map涓�
+ BasicDataMap.put(item,orderBasicDataList);
+ }
+ //閬嶅巻璁㈠崟鍩烘湰鏁版嵁
+ for (BasicData item : orderBasicData){
+ //灏嗘暟鎹斁鍏ist涓�
+ BasicDataMap.get(item.getBasicCategory()).add(item);
+ }
+ BasicDataMap.put("deliveryOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
+ return BasicDataMap;
+ }
+
+ public List<BasicData> getBasicDataByTypeAndChildType(String type, String childType) {
+ Map<String, List<Object>> BasicDataMap = new HashMap<>();
+ 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());
+ basicData.setNickname(map.get("nickname").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