From b56b30a9391e028721205b15da0c6fa58a3b3063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 31 May 2023 15:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLibraryBaseServiceImpl.java    |  5 +++--
 .../service/impl/ProjectStatusBoardServiceImpl.java    | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 9373a6125..f75e0937c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -3010,8 +3010,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		dataRow.createCell(3).setCellValue(submitAmount);
 		dataRow.createCell(4).setCellValue(syncReporAmount);
 		double parameterCollectingCount = notStartAmount + collectingAmount + submitAmount + syncReporAmount;
-		double parameterCollectingPercentage = (syncReporAmount / parameterCollectingCount) * 100;
-		String parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (syncReporAmount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
+		double completionCount = submitAmount + syncReporAmount;
+		double parameterCollectingPercentage = (completionCount / parameterCollectingCount) * 100;
+		String parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
 		dataRow.createCell(5).setCellValue(parameterCollectingPercentageStr + percentSign);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index bc204e2b7..34514e2a4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -984,8 +984,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 syncReporAmount = (double) syncReporMap.get("amount");
 
                 double parameterCollectingCount = notStartAmount + collectingAmount + submitAmount + syncReporAmount;
-                double parameterCollectingPercentage = ((submitAmount + syncReporAmount) / parameterCollectingCount) * 100;
-                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (syncReporAmount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
+                double completionCount = submitAmount + syncReporAmount;
+                double parameterCollectingPercentage = (completionCount / parameterCollectingCount) * 100;
+                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
             }
             dataRow.createCell(51).setCellValue(notStartAmount);
             dataRow.createCell(52).setCellValue(collectingAmount);
@@ -1187,8 +1188,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 double syncReporAmount = (double) syncReporMap.get("amount");
 
                 double parameterCollectingCount = notStartAmount + collectingAmount + submitAmount + syncReporAmount;
-                double parameterCollectingPercentage = (submitAmount + syncReporAmount) / parameterCollectingCount;
-                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (syncReporAmount !=0 )) ? parameterCollectingPercentage : 0;
+                double completionCount = submitAmount + syncReporAmount;
+                double parameterCollectingPercentage = (completionCount) / parameterCollectingCount;
+                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? parameterCollectingPercentage : 0;
             }
 
             Map<String,Object> certificationProgressMap = this.projectCertificationInventoryEOService.groupByCertificationProgress(pciEos);