From 2c51e2bac7e271f6bd1a7da060e4ffd327d5a8d2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 28 四月 2026 18:06:06 +0800
Subject: [PATCH] feat(production): 更新生产核算逻辑以支持设备和工时计算
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 8a2ccac..188f70e 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -298,8 +298,12 @@
analysisCustomerContractAmountsDto.setChain(chain);
Map<String, BigDecimal> collect = salesLedgers.stream()
- .collect(Collectors.groupingBy(SalesLedger::getCustomerName, Collectors.reducing(BigDecimal.ZERO,
- SalesLedger::getContractAmount, BigDecimal::add)));
+ .collect(Collectors.groupingBy(
+ salesLedger -> StringUtils.isBlank(salesLedger.getCustomerName()) ? "鏈垎閰嶅鎴�" : salesLedger.getCustomerName(),
+ Collectors.reducing(BigDecimal.ZERO,
+ salesLedger -> Objects.nonNull(salesLedger.getContractAmount())
+ ? salesLedger.getContractAmount() : BigDecimal.ZERO,
+ BigDecimal::add)));
List<MapDto> mapDtos = new ArrayList<>();
collect.forEach((k, v) -> {
MapDto mapDto = new MapDto();
--
Gitblit v1.9.3