From a1a27eba473c476cade23f003d3ac1f1cc1ac27d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 01 三月 2024 15:14:50 +0800
Subject: [PATCH] 报工明细表字段修改
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java | 76 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 13 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 22a0936..19ce357 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,43 +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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Service
@DS("sd")
public class BasicDateService {
@Autowired
- BasicDateMapper basicDateMapper;
+ private BasicDateMapper basicDateMapper;
+
+ @Autowired
+ private CustomerMapper customerMapper;
+
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁
-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");
+
+
+ //鑾峰彇瀹㈡埛鍒楄〃
+ 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涓�
- orderBasicDataMap.put(item,orderBasicDataList);
+ BasicDataMap.put(item,orderBasicDataList);
}
//閬嶅巻璁㈠崟鍩烘湰鏁版嵁
for (BasicData item : orderBasicData){
//灏嗘暟鎹斁鍏ist涓�
- orderBasicDataMap.get(item.getBasicCategory()).add(item);
+ BasicDataMap.get(item.getBasicCategory()).add(item);
}
- //杩斿洖Map瀵硅薄
- return orderBasicDataMap;
+ 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