From d04cdf7fa560cd86df690e6e5b754e26cdf0e42a Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 07 五月 2024 16:53:48 +0800
Subject: [PATCH] 提交权限部分查询代码
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java | 19 ++++++++++++++-----
1 files changed, 14 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..54b6899 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() {
@@ -35,6 +41,8 @@
for (Customer customer : customerList){
orderBasicDataMap.get("customer").add(customer);
}
+
+ orderBasicDataMap.put("orderOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
//杩斿洖Map瀵硅薄
@@ -82,6 +90,7 @@
//灏嗘暟鎹斁鍏ist涓�
BasicDataMap.get(item.getBasicCategory()).add(item);
}
+ BasicDataMap.put("deliveryOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
return BasicDataMap;
}
--
Gitblit v1.8.0