From a24a2d86d2ae9f8c2f72ce14ed787c894b86061b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 01 四月 2026 11:10:45 +0800
Subject: [PATCH] fix: 客户档案跟进进度、跟进时间字段去掉

---
 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 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 b0cc3bd..dc8e2c4 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -2525,13 +2525,19 @@
         Map<String, Long> map = new HashMap<>();
         //鎬婚攢鍞噾棰�
         List<SalesDelivery> salesDeliveries = salesDeliveryMapper.selectList(null);
-        long sum = salesDeliveries.stream().mapToLong(value -> Long.parseLong(value.getPrice().toString())).sum();
-        map.put("price",sum/1000);//鍗曚綅w
+        BigDecimal sum = salesDeliveries.stream()
+                .map(item -> item.getPrice() != null ? new BigDecimal(item.getPrice().toString()) : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        long finalPrice = sum.divide(new BigDecimal("1000"), 0, RoundingMode.HALF_UP).longValue();
+        map.put("price", finalPrice);//鍗曚綅w
         //鎬诲彂璐у崟
-        map.put("delivery",salesDeliveries.stream().count());
+        map.put("delivery", (long) salesDeliveries.size());
         //鎬婚攢鍞柟鏁�
-        long volume = salesDeliveries.stream().mapToLong(value -> Long.parseLong(value.getVolume().toString())).sum();
-        map.put("volume",volume);
+        BigDecimal volume = salesDeliveries.stream()
+                .map(item -> item.getVolume() != null ? new BigDecimal(item.getVolume().toString()) : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        long finalVolume = volume.divide(new BigDecimal("1000"), 0, RoundingMode.HALF_UP).longValue();
+        map.put("volume",finalVolume);
         //绱瀹㈡埛
         Long count = customerMapper.selectCount(null);
         map.put("customer",count);

--
Gitblit v1.9.3