From 403848cb4bc6406360d1f43fed475940d039890a Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Wed, 19 Nov 2025 17:57:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PgsProgressCategoryServiceImpl.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
index afd16775..84df883b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
@@ -2444,6 +2444,11 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
                 .map(PgsProgressCategory::getUnitType)
                 .filter(Objects::nonNull)
                 .findFirst().orElse(null);
+            if (StringUtils.isNotBlank(unitType) && unitType.equals(PgsProgressUnitTypeEnum.PERCENTAGE.getValue())) {
+                BigDecimal size = BigDecimal.valueOf(value.size());
+                completedTotal = completedTotal.divide(size, 2, RoundingMode.HALF_UP);
+                finishedNum = finishedNum.divide(size, 2, RoundingMode.HALF_UP);
+            }
             // 封装数据
             PgsProgressCategoryDateTotalVo vo = new PgsProgressCategoryDateTotalVo();
             vo.setName(name);
@@ -2521,11 +2526,6 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
             if (planNumber.compareTo(BigDecimal.ZERO) <= 0) {
                 return;
             }
-            // 获取累计完成数量
-            BigDecimal completedTotal = value.stream()
-                .map(PgsProgressCategory::getCompleted)
-                .filter(Objects::nonNull)
-                .reduce(BigDecimal.ZERO, BigDecimal::add);
             // 获取类别单位
             String unit = value.stream()
                 .map(PgsProgressCategory::getUnit)