From 031fc1372fd4149fdaa2a9c60db177822e652de6 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 19 四月 2024 13:51:55 +0800
Subject: [PATCH] 添加其他金额等列名

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java |   18 +++++++++++++-----
 1 files changed, 13 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 d88eddb..818301d 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,29 @@
 package com.example.erp.service.sd;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.entity.sd.BasicData;
 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() {
@@ -36,6 +42,8 @@
             orderBasicDataMap.get("customer").add(customer);
         }
 
+        orderBasicDataMap.put("orderOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
+
 
         //杩斿洖Map瀵硅薄
         return orderBasicDataMap;

--
Gitblit v1.8.0