From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 54b6899..d544ce6 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,7 +1,9 @@
package com.example.erp.service.sd;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.sd.BasicData;
+import com.example.erp.entity.sd.BasicOtherMoney;
import com.example.erp.entity.sd.Customer;
import com.example.erp.mapper.sd.BasicDateMapper;
import com.example.erp.mapper.sd.BasicOtherMoneyMapper;
@@ -29,7 +31,7 @@
public Map<String, List<Object>> getOrderBasicData() {
//鑾峰彇璁㈠崟鍩烘湰鏁版嵁绫诲瀷
//鍒涘缓Map瀵硅薄
- Map<String, List<Object>> orderBasicDataMap = new HashMap<>(); ;
+ Map<String, List<Object>> orderBasicDataMap = new HashMap<>();
//鍒涘缓List瀵硅薄
orderBasicDataMap = getBasicDataByType("order");
@@ -39,10 +41,14 @@
orderBasicDataMap.put("customer",orderBasicDataList);
List<Customer> customerList = customerMapper.getCustomerList();
for (Customer customer : customerList){
+ customer.setProjectList(customerMapper.getProjectList(customer.getId()));
orderBasicDataMap.get("customer").add(customer);
}
- orderBasicDataMap.put("orderOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
+ orderBasicDataMap.put("orderOtherMoney",
+ Collections.singletonList(
+ basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))
+ ));
//杩斿洖Map瀵硅薄
@@ -90,7 +96,7 @@
//灏嗘暟鎹斁鍏ist涓�
BasicDataMap.get(item.getBasicCategory()).add(item);
}
- BasicDataMap.put("deliveryOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
+ BasicDataMap.put("deliveryOtherMoney", Collections.singletonList( basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))));
return BasicDataMap;
}
@@ -136,6 +142,7 @@
basicData.setBasicType(basicTypeList.get(0));
basicData.setBasicCategory(basicTypeList.get(1));
basicData.setBasicName(map.get("input").toString());
+ basicData.setNickname(map.get("nickname").toString());
basicDateMapper.insert(basicData);
}
return true;
--
Gitblit v1.8.0