From c8ebeb63d549adf498e7c3fbd2cf91ba8923e5f0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 02 二月 2024 15:39:52 +0800
Subject: [PATCH] 重新上传差异问题
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java | 23 ++++++++++++++++++-----
1 files changed, 18 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 22a0936..09d1b0b 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,21 +1,24 @@
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() {
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁绫诲瀷
@@ -37,6 +40,16 @@
//灏嗘暟鎹斁鍏ist涓�
orderBasicDataMap.get(item.getBasicCategory()).add(item);
}
+
+ //鑾峰彇瀹㈡埛鍒楄〃
+ 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;
}
--
Gitblit v1.8.0