From b4b70564a97aa59afe9e6344c6cd7ea95dd4d0b8 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 12 Oct 2023 18:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF-=E5=AF=BC=E5=87=BA=EF=BC=88=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=EF=BC=8C=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=EF=BC=8C=E9=AA=8C=E8=AF=81=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 79 ++++++++++---------
 .../impl/ProjectStatusBoardServiceImpl.java   | 10 +--
 2 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 564b436ea..b1ba0d549 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -11361,8 +11361,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		double complianceCount = 0;    // 符合
 		double nonComplianceCount = 0; // 不符合
 		double toBeTrackedCount = 0;   // 待追踪
-		double notInvolvedCount = 0;   // 不涉及
-		double taskTerminationCount = 0;   // 任务终止
+//		double notInvolvedCount = 0;   // 不涉及
+//		double taskTerminationCount = 0;   // 任务终止
 		double count = 0;
 		// 计算百分比
 		double percentage = 0;
@@ -11414,19 +11414,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> designNotInvolved = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> designNotInvolved = pliEos.stream().filter(pliEo -> {
+//				boolean flag = (
+//						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
+//				boolean flag = (
+//						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
 
 			notStartCount = designNotStart.size();
 			toBeSubmittedCount = designToBeSubmitted.size();
@@ -11434,9 +11434,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			complianceCount = designCompliance.size();
 			nonComplianceCount = designNonCompliance.size();
 			toBeTrackedCount = designToBeTracked.size();
-			notInvolvedCount = designNotInvolved.size();
-			taskTerminationCount = taskTermination.size();
-			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+//			notInvolvedCount = designNotInvolved.size();
+//			taskTerminationCount = taskTermination.size();
+//			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount;
 			// 计算百分比
 			if(count <= 0){
 				percentage = 0;
@@ -11452,8 +11453,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		projectScheduleExportMap.put("compliance",complianceCount);
 		projectScheduleExportMap.put("nonCompliance",nonComplianceCount);
 		projectScheduleExportMap.put("toBeTracked",toBeTrackedCount);
-		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
-		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
+//		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
+//		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
 		projectScheduleExportMap.put("count",count);
 		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
 		result.put("projectScheduleExportMap",projectScheduleExportMap);
@@ -11472,8 +11473,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		double complianceCount = 0;    // 符合
 		double nonComplianceCount = 0; // 不符合
 		double toBeTrackedCount = 0;   // 待追踪
-		double notInvolvedCount = 0;   // 不涉及
-		double taskTerminationCount = 0;   // 任务终止
+//		double notInvolvedCount = 0;   // 不涉及
+//		double taskTerminationCount = 0;   // 任务终止
 		double count = 0;
 		// 计算百分比
 		double percentage = 0;
@@ -11525,19 +11526,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> verifyNotInvolved = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> verifyNotInvolved = pliEos.stream().filter(pliEo -> {
+//				boolean flag = (
+//						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
+//				boolean flag = (
+//						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
 
 			notStartCount = verifyNotStart.size();
 			toBeSubmittedCount = verifyToBeSubmitted.size();
@@ -11545,10 +11546,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			complianceCount = verifyCompliance.size();
 			nonComplianceCount = verifyNonCompliance.size();
 			toBeTrackedCount = verifyToBeTracked.size();
-			notInvolvedCount = verifyNotInvolved.size();
-			taskTerminationCount = taskTermination.size();
-
-			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+//			notInvolvedCount = verifyNotInvolved.size();
+//			taskTerminationCount = taskTermination.size();
+//			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount;
 			if(count <= 0){
 				percentage = 0;
 			}else{
@@ -11564,8 +11565,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		projectScheduleExportMap.put("compliance",complianceCount);
 		projectScheduleExportMap.put("nonCompliance",nonComplianceCount);
 		projectScheduleExportMap.put("toBeTracked",toBeTrackedCount);
-		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
-		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
+//		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
+//		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
 		projectScheduleExportMap.put("count",count);
 		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
 		result.put("projectScheduleExportMap",projectScheduleExportMap);
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 83daf1b74..375232f46 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
@@ -1046,8 +1046,8 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double designCompliance = (double) designMapProjectScheduleExportMap.get("compliance");
             double designNonCompliance = (double) designMapProjectScheduleExportMap.get("nonCompliance");
             double designToBeTracked = (double) designMapProjectScheduleExportMap.get("toBeTracked");
-            double designNotInvolved = (double) designMapProjectScheduleExportMap.get("notInvolved");
-            double designTaskTermination = (double) designMapProjectScheduleExportMap.get("taskTermination");
+//            double designNotInvolved = (double) designMapProjectScheduleExportMap.get("notInvolved");
+//            double designTaskTermination = (double) designMapProjectScheduleExportMap.get("taskTermination");
             // double designCount = (double) designMapProjectScheduleExportMap.get("count");
             String designPercentage = (String) designMapProjectScheduleExportMap.get("percentage");
             dataRow.createCell(8).setCellValue(designNotStart);
@@ -1072,9 +1072,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double verifyCompliance = (double) verifyMapProjectScheduleExportMap.get("compliance");
             double verifyNonCompliance = (double) verifyMapProjectScheduleExportMap.get("nonCompliance");
             double verifyToBeTracked = (double) verifyMapProjectScheduleExportMap.get("toBeTracked");
-            double verifyNotInvolved = (double) verifyMapProjectScheduleExportMap.get("notInvolved");
-            double verifyTaskTermination = (double) verifyMapProjectScheduleExportMap.get("taskTermination");
-            double verifyCount = (double) verifyMapProjectScheduleExportMap.get("count");
+//            double verifyNotInvolved = (double) verifyMapProjectScheduleExportMap.get("notInvolved");
+//            double verifyTaskTermination = (double) verifyMapProjectScheduleExportMap.get("taskTermination");
+//            double verifyCount = (double) verifyMapProjectScheduleExportMap.get("count");
             String verifyPercentage = (String) verifyMapProjectScheduleExportMap.get("percentage");
             dataRow.createCell(16).setCellValue(verifyNotStart);
             dataRow.createCell(17).setCellValue(verifyToBeSubmitted);