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 | 93 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 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 new file mode 100644 index 0000000..19ce357 --- /dev/null +++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java @@ -0,0 +1,93 @@ +package com.example.erp.service.sd; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.example.erp.entity.sd.Customer; +import com.example.erp.mapper.sd.BasicDateMapper; +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; + + @Autowired + private CustomerMapper customerMapper; + + //鑾峰彇璁㈠崟鍩烘湰鏁版嵁 + public Map<String, List<Object>> getOrderBasicData() { + //鑾峰彇璁㈠崟鍩烘湰鏁版嵁绫诲瀷 + //鍒涘缓Map瀵硅薄 + Map<String, List<Object>> orderBasicDataMap = new HashMap<>(); ; + //鍒涘缓List瀵硅薄 + orderBasicDataMap = getBasicDataByType("order"); + + + //鑾峰彇瀹㈡埛鍒楄〃 + List<Object> orderBasicDataList = new ArrayList<>(); + orderBasicDataMap.put("customer",orderBasicDataList); + List<Customer> customerList = customerMapper.getCustomerList(); + for (Customer customer : customerList){ + orderBasicDataMap.get("customer").add(customer); + } + + + //杩斿洖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); + } + 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