项目状态看板导出

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java

@@ -305,6 +305,20 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 */
 	Map<String, Object> groupByFGRwqrStatus(List<ProjectLawsInventoryEO> pliEos);
 
+	/**
+	 * 设计认为确认
+	 * @param pliEos
+	 * @return
+	 */
+	Map<String, Object> groupByFGRwqrStatusDesign(List<ProjectLawsInventoryEO> pliEos);
+
+	/**
+	 * 验证认为确认
+	 * @param pliEos
+	 * @return
+	 */
+	Map<String, Object> groupByFGRwqrStatusVerify(List<ProjectLawsInventoryEO> pliEos);
+
 	/**
 	 * 按照设计符合性状态分组
 	 * @param pliEos

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -6422,16 +6422,17 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		Map<String, Object> result = new HashMap<>();
 		Map<String,Object> projectScheduleExportMap = new HashMap<>();
 
-		double toBeReleasedCount = 0;
-		double toBeVerifiedCount = 0;
-		double toBeConfirmedCount = 0;
-		double acceptCount = 0;
-		double refuseCount = 0;
+		double toBeReleasedCount = 0;   //清单待发布
+		double toBeVerifiedCount = 0;   //任务待发起
+		double toBeConfirmedCount = 0;  //任务待确认
+		double acceptCount = 0;         //责任人接受
+		double refuseCount = 0;         //责任人拒绝
 		double count = 0;
 		// 计算百分比
 		double percentage = 0;
 		String percentageStr = "0";
 		if(CollectionUtils.isNotEmpty(pciEos)){
+			//清单待发布
 			List<ProjectCertificationInventoryEO> toBeReleased = pciEos.stream().filter(pciEo -> {
 				boolean flag = (
 						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
@@ -6440,6 +6441,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				return flag;
 			}).collect(Collectors.toList());
 
+			//任务待发起
 			List<ProjectCertificationInventoryEO> toBeVerified = pciEos.stream().filter(pciEo -> {
 				boolean flag = (
 						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
@@ -6447,6 +6449,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				return flag;
 			}).collect(Collectors.toList());
 
+			//任务待确认
 			List<ProjectCertificationInventoryEO> toBeConfirmed = pciEos.stream().filter(pciEo -> {
 				boolean flag = (
 						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
@@ -6454,6 +6457,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				return flag;
 			}).collect(Collectors.toList());
 
+			//责任人接受
 			List<ProjectCertificationInventoryEO> accept = pciEos.stream().filter(pciEo -> {
 				boolean flag = (
 						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
@@ -6464,6 +6468,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				return flag;
 			}).collect(Collectors.toList());
 
+			//责任人拒绝
 			List<ProjectCertificationInventoryEO> refuse = pciEos.stream().filter(pciEo -> {
 				boolean flag = (
 						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue())
@@ -6502,9 +6507,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		Map<String, Object> result = new HashMap<>();
 		Map<String,Object> projectScheduleExportMap = new HashMap<>();
 
-		double notStartCount = 0;         // 未发起
-		double toBeSubmittedCount = 0;    // 待提交
-		double toBeReviewedCount = 0;     // 待审查
+		double notStartCount = 0;         // 任务待确认
+		double toBeSubmittedCount = 0;    // 结果待提交
+		double toBeReviewedCount = 0;     // 结果待审查
 		double acceptCount = 0;           // 审查通过
 		double refuseCount = 0;           // 审查退回
 		double taskTerminationCount = 0;  // 任务终止
@@ -6514,6 +6519,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		String percentageStr = "0";
 		if(CollectionUtils.isNotEmpty(pciEos)){
 			List<ProjectCertificationInventoryEO> notStart = pciEos.stream().filter(pciEo -> {
+				// 任务待确认
 				boolean flag = (
 						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
 								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue())
@@ -6524,6 +6530,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				return flag;
 			}).collect(Collectors.toList());
 
+			// 结果待提交
 			List<ProjectCertificationInventoryEO> toBeSubmitted = pciEos.stream().filter(pciEo -> {
 				boolean flag = (
 						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
@@ -6531,6 +6538,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				return flag;
 			}).collect(Collectors.toList());
 
+			// 结果待审查
 			List<ProjectCertificationInventoryEO> toBeReviewed = pciEos.stream().filter(pciEo -> {
 				boolean flag = (
 						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
@@ -6538,6 +6546,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				return flag;
 			}).collect(Collectors.toList());
 
+			// 审查通过
 			List<ProjectCertificationInventoryEO> accept = pciEos.stream().filter(pciEo -> {
 				boolean flag = (
 						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
@@ -6545,6 +6554,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				return flag;
 			}).collect(Collectors.toList());
 
+			// 审查退回
 			List<ProjectCertificationInventoryEO> refuse = pciEos.stream().filter(pciEo -> {
 				boolean flag = (
 						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -11651,6 +11651,208 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		result.put("projectScheduleExportMap",projectScheduleExportMap);
 		return result;
 	}
+	@Override
+	public Map<String, Object> groupByFGRwqrStatusDesign(List<ProjectLawsInventoryEO> pliEos) {
+		Map<String,Object> result = new HashMap<>();
+
+		Map<String,Object> projectScheduleExportMap = new HashMap<>();
+		Map<String,Object> toBeReleasedMap = new HashMap<>();  //清单待发布
+		Map<String,Object> toBeVerifiedMap = new HashMap<>();  //任务待发起
+		Map<String,Object> toBeConfirmedMap = new HashMap<>(); //任务待确认
+		Map<String,Object> acceptMap = new HashMap<>();        //责任人接受
+		Map<String,Object> refuseMap = new HashMap<>();        //责任人拒绝
+
+		double toBeReleasedCount = 0;
+		double toBeVerifiedCount = 0;
+		double toBeConfirmedCount = 0;
+		double acceptCount = 0;
+		double refuseCount = 0;
+		double count = 0;
+		// 计算百分比
+		double percentage = 0;
+		String percentageStr = "0";
+		if(CollectionUtils.isNotEmpty(pliEos)){
+			//清单待发布
+			List<ProjectLawsInventoryEO> designToBeReleased = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			toBeReleasedMap.put("designToBeReleased",designToBeReleased);
+
+			//任务待发起
+			List<ProjectLawsInventoryEO> designToBeVerified = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			toBeVerifiedMap.put("designToBeVerified",designToBeVerified);
+
+			//任务待确认
+			List<ProjectLawsInventoryEO> designToBeConfirmed = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			toBeConfirmedMap.put("designToBeConfirmed",designToBeConfirmed);
+
+			//责任人接受
+			List<ProjectLawsInventoryEO> designAccept = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+//								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			acceptMap.put("designAccept",designAccept);
+
+			//责任人拒绝
+			List<ProjectLawsInventoryEO> designRefuse = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			refuseMap.put("designRefuse",designRefuse);
+
+			toBeReleasedCount = designToBeReleased.size();
+			toBeVerifiedCount = designToBeVerified.size();
+			toBeConfirmedCount = designToBeConfirmed.size();
+			acceptCount = designAccept.size();
+			refuseCount = designRefuse.size();
+			count = toBeReleasedCount + toBeVerifiedCount + toBeConfirmedCount + acceptCount + refuseCount;
+			if(count <= 0){
+				percentage = 0;
+			}else{
+				// 计算百分比
+				percentage = acceptCount / count * 100;
+			}
+			percentageStr = percentage != 0 ? df.format(percentage) : "0";
+		}
+		result.put(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue(),toBeReleasedMap);
+		result.put(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue(),toBeVerifiedMap);
+		result.put(ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue(),toBeConfirmedMap);
+		result.put(ComplianceFlowStatusEnum.DUTY_PERSON_ACCEPTED.getValue(),acceptMap);
+		result.put(ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue(),refuseMap);
+
+		projectScheduleExportMap.put("toBeReleased",toBeReleasedCount);
+		projectScheduleExportMap.put("toBeVerified",toBeVerifiedCount);
+		projectScheduleExportMap.put("toBeConfirmed",toBeConfirmedCount);
+		projectScheduleExportMap.put("accept",acceptCount);
+		projectScheduleExportMap.put("refuse",refuseCount);
+		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
+		result.put("projectScheduleExportMap",projectScheduleExportMap);
+		return result;
+	}
+	@Override
+	public Map<String, Object> groupByFGRwqrStatusVerify(List<ProjectLawsInventoryEO> pliEos) {
+		Map<String,Object> result = new HashMap<>();
+
+		Map<String,Object> projectScheduleExportMap = new HashMap<>();
+		Map<String,Object> toBeReleasedMap = new HashMap<>();//清单待发布
+		Map<String,Object> toBeVerifiedMap = new HashMap<>();//任务待发起
+		Map<String,Object> toBeConfirmedMap = new HashMap<>();//任务待确认
+		Map<String,Object> acceptMap = new HashMap<>();//责任人接受
+		Map<String,Object> refuseMap = new HashMap<>();//责任人拒绝
+
+		double toBeReleasedCount = 0;
+		double toBeVerifiedCount = 0;
+		double toBeConfirmedCount = 0;
+		double acceptCount = 0;
+		double refuseCount = 0;
+		double count = 0;
+		// 计算百分比
+		double percentage = 0;
+		String percentageStr = "0";
+		if(CollectionUtils.isNotEmpty(pliEos)){
+			//清单待发布
+			List<ProjectLawsInventoryEO> verifyToBeReleased = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			toBeReleasedMap.put("verifyToBeReleased",verifyToBeReleased);
+
+			//任务待发起
+			List<ProjectLawsInventoryEO> verifyToBeVerified = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			toBeVerifiedMap.put("verifyToBeVerified",verifyToBeVerified);
+
+			//任务待确认
+			List<ProjectLawsInventoryEO> verifyToBeConfirmed = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			toBeConfirmedMap.put("verifyToBeConfirmed",verifyToBeConfirmed);
+
+			//责任人接受
+			List<ProjectLawsInventoryEO> verifyAccept = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+//								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			acceptMap.put("verifyAccept",verifyAccept);
+
+			//责任人拒绝
+			List<ProjectLawsInventoryEO> verifyRefuse = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			refuseMap.put("verifyRefuse",verifyRefuse);
+
+			toBeReleasedCount = verifyToBeReleased.size();
+			toBeVerifiedCount = verifyToBeVerified.size();
+			toBeConfirmedCount = verifyToBeConfirmed.size();
+			acceptCount = verifyAccept.size();
+			refuseCount = verifyRefuse.size();
+			count = toBeReleasedCount + toBeVerifiedCount + toBeConfirmedCount + acceptCount + refuseCount;
+			if(count <= 0){
+				percentage = 0;
+			}else{
+				// 计算百分比
+				percentage = acceptCount / count * 100;
+			}
+			percentageStr = percentage != 0 ? df.format(percentage) : "0";
+		}
+		result.put(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue(),toBeReleasedMap);
+		result.put(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue(),toBeVerifiedMap);
+		result.put(ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue(),toBeConfirmedMap);
+		result.put(ComplianceFlowStatusEnum.DUTY_PERSON_ACCEPTED.getValue(),acceptMap);
+		result.put(ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue(),refuseMap);
+
+		projectScheduleExportMap.put("toBeReleased",toBeReleasedCount);
+		projectScheduleExportMap.put("toBeVerified",toBeVerifiedCount);
+		projectScheduleExportMap.put("toBeConfirmed",toBeConfirmedCount);
+		projectScheduleExportMap.put("accept",acceptCount);
+		projectScheduleExportMap.put("refuse",refuseCount);
+		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
+		result.put("projectScheduleExportMap",projectScheduleExportMap);
+		return result;
+	}
 
 	@Override
 	public Map<String, Object> groupByDesignStatus(List<ProjectLawsInventoryEO> pliEos) {
@@ -11658,19 +11860,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		Map<String,Object> projectScheduleExportMap = new HashMap<>();
 
-		double notStartCount = 0;      // 未发起
-		double toBeSubmittedCount = 0; // 待提交
-		double toBeReviewedCount = 0;  // 待审查
+		double notStartCount = 0;      // 任务待确认
+		double toBeSubmittedCount = 0; // 结果待提交
+		double toBeReviewedCount = 0;  // 结果待审查
 		double complianceCount = 0;    // 符合
 		double nonComplianceCount = 0; // 不符合
 		double toBeTrackedCount = 0;   // 待追踪
-//		double notInvolvedCount = 0;   // 不涉及
-//		double taskTerminationCount = 0;   // 任务终止
 		double count = 0;
 		// 计算百分比
 		double percentage = 0;
 		String percentageStr = "0";
 		if(CollectionUtils.isNotEmpty(pliEos)){
+			// 任务待确认
 			List<ProjectLawsInventoryEO> designNotStart = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
@@ -11682,6 +11883,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
+			// 结果待提交
 			List<ProjectLawsInventoryEO> designToBeSubmitted = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
@@ -11689,6 +11891,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
+			// 结果待审查
 			List<ProjectLawsInventoryEO> designToBeReviewed = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
@@ -11696,6 +11899,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
+			// 符合
 			List<ProjectLawsInventoryEO> designCompliance = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
@@ -11703,6 +11907,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
+			// 不符合
 			List<ProjectLawsInventoryEO> designNonCompliance = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
@@ -11710,6 +11915,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
+			// 待追踪
 			List<ProjectLawsInventoryEO> designToBeTracked = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
@@ -11717,19 +11923,6 @@ 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> 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();
@@ -11737,9 +11930,6 @@ 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;
 			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount;
 			// 计算百分比
 			if(count <= 0){
@@ -11756,8 +11946,6 @@ 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("count",count);
 		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
 		result.put("projectScheduleExportMap",projectScheduleExportMap);
@@ -11770,12 +11958,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		Map<String,Object> projectScheduleExportMap = new HashMap<>();
 
-		double notStartCount = 0;      // 未发起
-		double toBeSubmittedCount = 0; // 待提交
-		double toBeReviewedCount = 0;  // 待审查
-		double complianceCount = 0;    // 符合
-		double nonComplianceCount = 0; // 不符合
-		double toBeTrackedCount = 0;   // 待追踪
+		double notStartCount = 0;      //任务待确认
+		double toBeSubmittedCount = 0; //结果待提交
+		double toBeReviewedCount = 0;  //结果待审查
+		double complianceCount = 0;    //符合
+		double nonComplianceCount = 0; //不符合
+		double toBeTrackedCount = 0;   //待追踪
 //		double notInvolvedCount = 0;   // 不涉及
 //		double taskTerminationCount = 0;   // 任务终止
 		double count = 0;
@@ -11783,6 +11971,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		double percentage = 0;
 		String percentageStr = "0";
 		if(CollectionUtils.isNotEmpty(pliEos)){
+			//任务待确认
 			List<ProjectLawsInventoryEO> verifyNotStart = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
@@ -11794,6 +11983,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
+			//结果待提交
 			List<ProjectLawsInventoryEO> verifyToBeSubmitted = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
@@ -11801,6 +11991,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
+			//结果待审查
 			List<ProjectLawsInventoryEO> verifyToBeReviewed = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
@@ -11808,6 +11999,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
+			//符合
 			List<ProjectLawsInventoryEO> verifyCompliance = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
@@ -11815,6 +12007,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
+			//不符合
 			List<ProjectLawsInventoryEO> verifyNonCompliance = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
@@ -11822,6 +12015,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
+			//待追踪
 			List<ProjectLawsInventoryEO> verifyToBeTracked = pliEos.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java

@@ -837,32 +837,56 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
 
     @NotNull
     private HSSFSheet createCorssProjectProgressSheet(HSSFWorkbook workbook, ProjectLibraryBase projectLibraryBase) {
-        String cut = projectLibraryBase.getCut();
-        String sheetName = "项目进度";
+//        String cut = projectLibraryBase.getCut();
+//        String sheetName = "项目进度";
 //        String firstTitle = "项目," +
 //                "法规任务确认," +
-//                "设计符合性确认," +
-//                "验证符合性确认," +
+//                "设计符合性," +
+//                "验证符合性," +
 //                "认证任务确认," +
-//                "Pre-Homo确认," +
+//                "Pre-Homo流程," +
 //                "认证进度," +
-//                "参数收集";
-//                String secondTitle = "待发布,待校核,待确认,接受,拒绝,完成度,责任确认日期," +
-//                "未发起,待提交,待审查,符合,不符合,待追踪,不涉及,任务终止,完成度,设计核查日期," +
-//                "未发起,待提交,待审查,符合,不符合,待追踪,不涉及,任务终止,完成度,验证核查日期," +
-//                "待发布,待校核,待确认,接受,拒绝,完成度,责任确认日期," +
-//                "未发起,待提交,待审查,审查通过,审查退回,完成度,认证开始日期," +
-//                "待开始,进行中,实验通过,实验失败,部件报告未提交,部件报告已提交,部件报告已入库,完成度,认证提交时间," +
-//                "未开始,收集中,已提交,已同步至上报库,完成度,认证提交时间";
+//                "参数收集进度";
+//        String secondTitle = "清单待发布,任务待发起,任务待确认,责任人接受,责任人拒绝,完成度,责任确认日期," +
+//                "任务待确认,结果待提交,结果待审查,符合,不符合,待追踪,完成度,设计核查日期," +//去掉不涉及，任务终止
+//                "任务待确认,结果待提交,结果待审查,符合,不符合,待追踪,完成度,验证核查日期," +//删掉2个
+//                "清单待发布,任务待发起,任务待确认,责任人接受,责任人拒绝,完成度,责任确认日期," +
+//                "任务待确认,结果待提交,结果待审查,审查通过,审查退回,完成度,认证开始日期," +
+//                "待开始,进行中,实验通过,实验失败,完成度,认证提交时间," +//删掉3个
+//                "未发起,收集中,已提交,已同步至上报库,完成度,认证提交时间";
+//
+//        if(com.jero.modules.system.util.StringUtils.equals(cut,CutEnum.EN.getValue())){
+//            sheetName = "Project Progress";
+//            firstTitle = "Project," +
+//                    "Confirmation of regulatory tasks," +
+//                    "Design compliance," +
+//                    "Verification compliance," +
+//                    "Certification task confirmation," +
+//                    "Pre Homo process," +
+//                    "Certification progress," +
+//                    "Parameter collection progress";
+//            secondTitle = "List to be released,Task to be initiated,Task to be confirmed,Assignee accept,Assignee refuse,Completion degree,Responsibility confirmation date," +
+//                    "Task to be confirmed,Results to be submitted,Results to be reviewed,Compliance,Non-compliance,To be tracked,Completion degree,Design verification date," +
+//                    "Task to be confirmed,Results to be submitted,Results to be reviewed,Compliance,Non-compliance,To be tracked,Completion degree,Verification verification date," +
+//                    "List to be released,Task to be initiated,Task to be confirmed,Assignee accept,Assignee refuse,Completion degree,Responsibility confirmation date," +
+//                    "Task to be confirmed,Results to be submitted,Results to be reviewed,Review passed,Review return,Completion degree,Certification start date," +
+//                    "To begin,In progress,Experiment passed,Experimental failure,Completion degree,Certification submission time," +
+//                    "Not initiated,Collecting,Submitted,Synchronized to the upper report library,Completion degree,Certification submission time";
+//        }
+        String cut = projectLibraryBase.getCut();
+        String sheetName = "项目进度";
         String firstTitle = "项目," +
-                "法规任务确认," +
+                "设计任务确认," +
+                "验证任务确认," +
                 "设计符合性," +
                 "验证符合性," +
                 "认证任务确认," +
                 "Pre-Homo流程," +
                 "认证进度," +
                 "参数收集进度";
-        String secondTitle = "清单待发布,任务待发起,任务待确认,责任人接受,责任人拒绝,完成度,责任确认日期," +
+        String secondTitle =
+                "清单待发布,任务待发起,任务待确认,责任人接受,责任人拒绝,完成度,责任确认日期," +
+                "清单待发布,任务待发起,任务待确认,责任人接受,责任人拒绝,完成度,责任确认日期," +
                 "任务待确认,结果待提交,结果待审查,符合,不符合,待追踪,完成度,设计核查日期," +//去掉不涉及，任务终止
                 "任务待确认,结果待提交,结果待审查,符合,不符合,待追踪,完成度,验证核查日期," +//删掉2个
                 "清单待发布,任务待发起,任务待确认,责任人接受,责任人拒绝,完成度,责任确认日期," +
@@ -873,37 +897,23 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
         if(com.jero.modules.system.util.StringUtils.equals(cut,CutEnum.EN.getValue())){
             sheetName = "Project Progress";
             firstTitle = "Project," +
-                    "Confirmation of regulatory tasks," +
+                    "Design Task Confirmation," +
+                    "Verification Task Confirmation," +
                     "Design compliance," +
                     "Verification compliance," +
                     "Certification task confirmation," +
                     "Pre Homo process," +
                     "Certification progress," +
                     "Parameter collection progress";
-            secondTitle = "List to be released,Task to be initiated,Task to be confirmed,Assignee accept,Assignee refuse,Completion degree,Responsibility confirmation date," +
+            secondTitle =
+                    "List to be released,Task to be initiated,Task to be confirmed,Assignee accept,Assignee refuse,Completion degree,Responsibility confirmation date," +
+                    "List to be released,Task to be initiated,Task to be confirmed,Assignee accept,Assignee refuse,Completion degree,Responsibility confirmation date," +
                     "Task to be confirmed,Results to be submitted,Results to be reviewed,Compliance,Non-compliance,To be tracked,Completion degree,Design verification date," +
                     "Task to be confirmed,Results to be submitted,Results to be reviewed,Compliance,Non-compliance,To be tracked,Completion degree,Verification verification date," +
                     "List to be released,Task to be initiated,Task to be confirmed,Assignee accept,Assignee refuse,Completion degree,Responsibility confirmation date," +
                     "Task to be confirmed,Results to be submitted,Results to be reviewed,Review passed,Review return,Completion degree,Certification start date," +
                     "To begin,In progress,Experiment passed,Experimental failure,Completion degree,Certification submission time," +
                     "Not initiated,Collecting,Submitted,Synchronized to the upper report library,Completion degree,Certification submission time";
-
-            //            firstTitle = "Project," +
-//                    "Confirmation of regulatory tasks," +
-//                    "Confirmation of design compliance," +
-//                    "Verification of compliance confirmation," +
-//                    "Certification task confirmation," +
-//                    "Pre Homo confirmation," +
-//                    "Certification progress," +
-//                    "Parameter collection";
-            //            secondTitle = "To be released,To be verified,To be confirmed,Accept,Refuse,Completion degree,Responsibility confirmation date," +
-//                    "Not initiated,To be submitted,Pending review,Conform to,Non Conformance,To be tracked,Not involved,Task Termination,Completion degree,Design verification date," +
-//                    "Not initiated,To be submitted,Pending review,Conform to,Non Conformance,To be tracked,Not involved,Task Termination,Completion degree,Verification verification date," +
-//                    "To be released,To be verified,To be confirmed,Accept,Refuse,Completion degree,Responsibility confirmation date," +
-//                    "Not initiated,To be submitted,Pending review,Review passed,Review return,Completion degree,Certification start date," +
-//                    "To begin,In progress,Experiment passed,Experimental failure,Component report not submitted,Component report submitted,Component report has been stored,Completion degree,Certification submission time," +
-//                    "Not started,Collecting,Submitted,Synchronized to the upper report library,Completion degree,Certification submission time";
-
         }
         HSSFSheet sheet = workbook.createSheet(sheetName);
 
@@ -911,18 +921,20 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
         sheet.addMergedRegion(region1);
         CellRangeAddress region6 = new CellRangeAddress(0, 0, 1, 7);
         sheet.addMergedRegion(region6);
-        CellRangeAddress region7 = new CellRangeAddress(0, 0, 8, 15);
+        CellRangeAddress region7 = new CellRangeAddress(0, 0, 8, 14);
         sheet.addMergedRegion(region7);
-        CellRangeAddress region8 = new CellRangeAddress(0, 0, 16, 23);
+        CellRangeAddress region8 = new CellRangeAddress(0, 0, 15, 22);
         sheet.addMergedRegion(region8);
-        CellRangeAddress region9 = new CellRangeAddress(0, 0, 24, 30);
+        CellRangeAddress region9 = new CellRangeAddress(0, 0, 23, 30);
         sheet.addMergedRegion(region9);
         CellRangeAddress region10 = new CellRangeAddress(0, 0, 31, 37);
         sheet.addMergedRegion(region10);
-        CellRangeAddress region11 = new CellRangeAddress(0, 0, 38, 43);
+        CellRangeAddress region11 = new CellRangeAddress(0, 0, 38, 44);
         sheet.addMergedRegion(region11);
-        CellRangeAddress region12 = new CellRangeAddress(0, 0, 44, 49);
+        CellRangeAddress region12 = new CellRangeAddress(0, 0, 45, 50);
         sheet.addMergedRegion(region12);
+        CellRangeAddress region13 = new CellRangeAddress(0, 0, 51, 56);
+        sheet.addMergedRegion(region13);
 
         String[] firstTitleArr = firstTitle.split(",");
         String[] secondTitleArr = secondTitle.split(",");
@@ -932,7 +944,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
         CellStyle cellStyleTitle = workbook.createCellStyle();
         cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
         cellStyleTitle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
-        for (int i = 0; i <= 49; i++){
+        for (int i = 0; i <= 56; i++){
             sheet.setColumnWidth(i, 4000);
             Cell firstRowCell = firstRow.createCell(i);
             firstRowCell.setCellStyle(cellStyleTitle);
@@ -942,16 +954,18 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 firstRowCell.setCellValue(firstTitleArr[1]);
             }else if(i == 8){
                 firstRowCell.setCellValue(firstTitleArr[2]);
-            }else if(i == 16){
+            }else if(i == 15){
                 firstRowCell.setCellValue(firstTitleArr[3]);
-            }else if(i == 24){
+            }else if(i == 23){
                 firstRowCell.setCellValue(firstTitleArr[4]);
             }else if(i == 31){
                 firstRowCell.setCellValue(firstTitleArr[5]);
             }else if(i == 38){
                 firstRowCell.setCellValue(firstTitleArr[6]);
-            }else if(i == 44){
+            }else if(i == 45){
                 firstRowCell.setCellValue(firstTitleArr[7]);
+            }else if(i == 51){
+                firstRowCell.setCellValue(firstTitleArr[8]);
             }
             if(i >= 1){
                 Cell secondRowCell = secondRow.createCell(i);
@@ -1016,28 +1030,52 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     certificationSubmissionStr = DateUtils.formatDate(certificationSubmission);
                 }
             }
+            //设计任务确认
             List<ProjectLawsInventoryEO> pliEos = pliEoList.stream().filter(pliEo -> StringUtils.equals(pliEo.getProjectLibraryId(), plbEo.getId())).collect(Collectors.toList());
-            Map<String,Object> fgRwqrMap = this.projectLawsInventoryEOService.groupByFGRwqrStatus(pliEos);
-            Map<String,Object> fgRwqrProjectScheduleExportMap = (Map<String, Object>) fgRwqrMap.get("projectScheduleExportMap");
-            double fgrqqrToBeReleased = (double) fgRwqrProjectScheduleExportMap.get("toBeReleased");
-            double fgrqqrToBeVerified = (double) fgRwqrProjectScheduleExportMap.get("toBeVerified");
-            double fgrqqrToBeConfirmed = (double) fgRwqrProjectScheduleExportMap.get("toBeConfirmed");
-            double fgrqqrAccept = (double) fgRwqrProjectScheduleExportMap.get("accept");
-            double fgrqqrRefuse = (double) fgRwqrProjectScheduleExportMap.get("refuse");
-            String fgrqqrPercentage = (String) fgRwqrProjectScheduleExportMap.get("percentage");
-            dataRow.createCell(1).setCellValue(fgrqqrToBeReleased);
-            dataRow.createCell(2).setCellValue(fgrqqrToBeVerified);
-            dataRow.createCell(3).setCellValue(fgrqqrToBeConfirmed);
-            dataRow.createCell(4).setCellValue(fgrqqrAccept);
-            dataRow.createCell(5).setCellValue(fgrqqrRefuse);
+            Map<String,Object> fgRwqrMapDesign = this.projectLawsInventoryEOService.groupByFGRwqrStatusDesign(pliEos);
+            Map<String,Object> fgRwqrProjectScheduleExportMapDesign = (Map<String, Object>) fgRwqrMapDesign.get("projectScheduleExportMap");
+            double fgrqqrToBeReleasedDesign = (double) fgRwqrProjectScheduleExportMapDesign.get("toBeReleased");
+            double fgrqqrToBeVerifiedDesign = (double) fgRwqrProjectScheduleExportMapDesign.get("toBeVerified");
+            double fgrqqrToBeConfirmedDesign = (double) fgRwqrProjectScheduleExportMapDesign.get("toBeConfirmed");
+            double fgrqqrAcceptDesign = (double) fgRwqrProjectScheduleExportMapDesign.get("accept");
+            double fgrqqrRefuseDesign = (double) fgRwqrProjectScheduleExportMapDesign.get("refuse");
+            String fgrqqrPercentageDesign = (String) fgRwqrProjectScheduleExportMapDesign.get("percentage");
+            dataRow.createCell(1).setCellValue(fgrqqrToBeReleasedDesign);
+            dataRow.createCell(2).setCellValue(fgrqqrToBeVerifiedDesign);
+            dataRow.createCell(3).setCellValue(fgrqqrToBeConfirmedDesign);
+            dataRow.createCell(4).setCellValue(fgrqqrAcceptDesign);
+            dataRow.createCell(5).setCellValue(fgrqqrRefuseDesign);
 
             Cell cell = dataRow.createCell(6);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
-            cell.setCellValue(Double.valueOf(fgrqqrPercentage.replace("%",""))/100);
+            cell.setCellValue(Double.valueOf(fgrqqrPercentageDesign.replace("%",""))/100);
 
             dataRow.createCell(7).setCellValue(legalTaskConfirmationStr);
 
+            //验证任务确认
+            Map<String,Object> fgRwqrMapVerify = this.projectLawsInventoryEOService.groupByFGRwqrStatusVerify(pliEos);
+            Map<String,Object> fgRwqrProjectScheduleExportMapVerify = (Map<String, Object>) fgRwqrMapVerify.get("projectScheduleExportMap");
+            double fgrqqrToBeReleasedVerify = (double) fgRwqrProjectScheduleExportMapVerify.get("toBeReleased");
+            double fgrqqrToBeVerifiedVerify = (double) fgRwqrProjectScheduleExportMapVerify.get("toBeVerified");
+            double fgrqqrToBeConfirmedVerify = (double) fgRwqrProjectScheduleExportMapVerify.get("toBeConfirmed");
+            double fgrqqrAcceptVerify = (double) fgRwqrProjectScheduleExportMapVerify.get("accept");
+            double fgrqqrRefuseVerify = (double) fgRwqrProjectScheduleExportMapVerify.get("refuse");
+            String fgrqqrPercentageVerify = (String) fgRwqrProjectScheduleExportMapVerify.get("percentage");
+            dataRow.createCell(8).setCellValue(fgrqqrToBeReleasedVerify);
+            dataRow.createCell(9).setCellValue(fgrqqrToBeVerifiedVerify);
+            dataRow.createCell(10).setCellValue(fgrqqrToBeConfirmedVerify);
+            dataRow.createCell(11).setCellValue(fgrqqrAcceptVerify);
+            dataRow.createCell(12).setCellValue(fgrqqrRefuseVerify);
+
+            cell = dataRow.createCell(13);
+            cell.setCellStyle(style);
+            cell.setCellType(CellType.NUMERIC);
+            cell.setCellValue(Double.valueOf(fgrqqrPercentageVerify.replace("%",""))/100);
+
+            dataRow.createCell(14).setCellValue(legalTaskConfirmationStr);
+
+            //设计符合性
             Map<String,Object> designMap = this.projectLawsInventoryEOService.groupByDesignStatus(pliEos);
             Map<String,Object> designMapProjectScheduleExportMap = (Map<String, Object>) designMap.get("projectScheduleExportMap");
             double designNotStart = (double) designMapProjectScheduleExportMap.get("notStart");
@@ -1046,24 +1084,20 @@ 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 designCount = (double) designMapProjectScheduleExportMap.get("count");
             String designPercentage = (String) designMapProjectScheduleExportMap.get("percentage");
-            dataRow.createCell(8).setCellValue(designNotStart);
-            dataRow.createCell(9).setCellValue(designToBeSubmitted);
-            dataRow.createCell(10).setCellValue(designToBeReviewed);
-            dataRow.createCell(11).setCellValue(designCompliance);
-            dataRow.createCell(12).setCellValue(designNonCompliance);
-            dataRow.createCell(13).setCellValue(designToBeTracked);
-//            dataRow.createCell(14).setCellValue(designNotInvolved);
-//            dataRow.createCell(15).setCellValue(designTaskTermination);
-            cell = dataRow.createCell(14);
+            dataRow.createCell(15).setCellValue(designNotStart);
+            dataRow.createCell(16).setCellValue(designToBeSubmitted);
+            dataRow.createCell(17).setCellValue(designToBeReviewed);
+            dataRow.createCell(18).setCellValue(designCompliance);
+            dataRow.createCell(19).setCellValue(designNonCompliance);
+            dataRow.createCell(20).setCellValue(designToBeTracked);
+            cell = dataRow.createCell(21);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(designPercentage.replace("%",""))/100);
-            dataRow.createCell(15).setCellValue(designDeadlineStr);
+            dataRow.createCell(22).setCellValue(designDeadlineStr);
 
+            //验证符合性
             Map<String,Object> verifyMap = this.projectLawsInventoryEOService.groupByVerifyStatus(pliEos);
             Map<String,Object> verifyMapProjectScheduleExportMap = (Map<String, Object>) verifyMap.get("projectScheduleExportMap");
             double verifyNotStart = (double) verifyMapProjectScheduleExportMap.get("notStart");
@@ -1076,20 +1110,21 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
 //            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);
-            dataRow.createCell(18).setCellValue(verifyToBeReviewed);
-            dataRow.createCell(19).setCellValue(verifyCompliance);
-            dataRow.createCell(20).setCellValue(verifyNonCompliance);
-            dataRow.createCell(21).setCellValue(verifyToBeTracked);
+            dataRow.createCell(23).setCellValue(verifyNotStart);
+            dataRow.createCell(24).setCellValue(verifyToBeSubmitted);
+            dataRow.createCell(25).setCellValue(verifyToBeReviewed);
+            dataRow.createCell(26).setCellValue(verifyCompliance);
+            dataRow.createCell(27).setCellValue(verifyNonCompliance);
+            dataRow.createCell(28).setCellValue(verifyToBeTracked);
 //            dataRow.createCell(24).setCellValue(verifyNotInvolved);
 //            dataRow.createCell(25).setCellValue(verifyTaskTermination);
-            cell = dataRow.createCell(22);
+            cell = dataRow.createCell(29);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(verifyPercentage.replace("%",""))/100);
-            dataRow.createCell(23).setCellValue(verifyDeadlineStr);
+            dataRow.createCell(30).setCellValue(verifyDeadlineStr);
 
+            //认证任务确认
             List<ProjectCertificationInventoryEO> pciEos = pciEoList.stream().filter(pciEo -> StringUtils.equals(pciEo.getProjectLibraryId(), plbEo.getId())).collect(Collectors.toList());
             Map<String,Object> rzRwqrMap = this.projectCertificationInventoryEOService.groupByFGRwqrStatus(pciEos);
             Map<String,Object> rzRwqrProjectScheduleExportMap = (Map<String, Object>) rzRwqrMap.get("projectScheduleExportMap");
@@ -1099,17 +1134,18 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double rzRqqrAccept = (double) rzRwqrProjectScheduleExportMap.get("accept");
             double rzRqqrRefuse = (double) rzRwqrProjectScheduleExportMap.get("refuse");
             String rzRqqrPercentage = (String) rzRwqrProjectScheduleExportMap.get("percentage");
-            dataRow.createCell(24).setCellValue(rzRqqrToBeReleased);
-            dataRow.createCell(25).setCellValue(rzRqqrToBeVerified);
-            dataRow.createCell(26).setCellValue(rzRqqrToBeConfirmed);
-            dataRow.createCell(27).setCellValue(rzRqqrAccept);
-            dataRow.createCell(28).setCellValue(rzRqqrRefuse);
-            cell = dataRow.createCell(29);
+            dataRow.createCell(31).setCellValue(rzRqqrToBeReleased);
+            dataRow.createCell(32).setCellValue(rzRqqrToBeVerified);
+            dataRow.createCell(33).setCellValue(rzRqqrToBeConfirmed);
+            dataRow.createCell(34).setCellValue(rzRqqrAccept);
+            dataRow.createCell(35).setCellValue(rzRqqrRefuse);
+            cell = dataRow.createCell(36);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(rzRqqrPercentage.replace("%",""))/100);
-            dataRow.createCell(30).setCellValue(legalTaskConfirmationStr);
+            dataRow.createCell(37).setCellValue(legalTaskConfirmationStr);
 
+            //Pre-Homo流程
             Map<String,Object> preHomoMap = this.projectCertificationInventoryEOService.groupByPreHomoStatus(pciEos);
             Map<String,Object> preHomoProjectScheduleExportMap = (Map<String, Object>) preHomoMap.get("projectScheduleExportMap");
             double preHomoNotStartCount = (double) preHomoProjectScheduleExportMap.get("notStartCount");
@@ -1118,17 +1154,18 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double preHomoAccept = (double) preHomoProjectScheduleExportMap.get("accept");
             double preHomoRefuse = (double) preHomoProjectScheduleExportMap.get("refuse");
             String preHomoPercentage = (String) preHomoProjectScheduleExportMap.get("percentage");
-            dataRow.createCell(31).setCellValue(preHomoNotStartCount);
-            dataRow.createCell(32).setCellValue(preHomoToBeSubmittedCount);
-            dataRow.createCell(33).setCellValue(preHomoToBeReviewedCount);
-            dataRow.createCell(34).setCellValue(preHomoAccept);
-            dataRow.createCell(35).setCellValue(preHomoRefuse);
-            cell = dataRow.createCell(36);
+            dataRow.createCell(38).setCellValue(preHomoNotStartCount);
+            dataRow.createCell(39).setCellValue(preHomoToBeSubmittedCount);
+            dataRow.createCell(40).setCellValue(preHomoToBeReviewedCount);
+            dataRow.createCell(41).setCellValue(preHomoAccept);
+            dataRow.createCell(42).setCellValue(preHomoRefuse);
+            cell = dataRow.createCell(43);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(preHomoPercentage.replace("%",""))/100);
-            dataRow.createCell(37).setCellValue(attestationStartTimeStr);
+            dataRow.createCell(44).setCellValue(attestationStartTimeStr);
 
+            //认证进度
             Map<String,Object> certificationProgressMap = this.projectCertificationInventoryEOService.groupByCertificationProgress(pciEos);
             Map<String,Object> certificationProgressMapProjectScheduleExportMap = (Map<String, Object>) certificationProgressMap.get("projectScheduleExportMap");
             double certificationProgressNotStartCount = (double) certificationProgressMapProjectScheduleExportMap.get("notStartCount");
@@ -1140,18 +1177,18 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
 //            double certificationProgressStoredCount = (double) certificationProgressMapProjectScheduleExportMap.get("storedCount");
             // String certificationProgressCount = (String) certificationProgressMapProjectScheduleExportMap.get("count");
             String certificationProgressPercentage = (String) certificationProgressMapProjectScheduleExportMap.get("percentage");
-            dataRow.createCell(38).setCellValue(certificationProgressNotStartCount);
-            dataRow.createCell(39).setCellValue(certificationProgressInProgressCount);
-            dataRow.createCell(40).setCellValue(certificationProgressTestPassedCount);
-            dataRow.createCell(41).setCellValue(certificationProgressTestFailedCount);
+            dataRow.createCell(45).setCellValue(certificationProgressNotStartCount);
+            dataRow.createCell(46).setCellValue(certificationProgressInProgressCount);
+            dataRow.createCell(47).setCellValue(certificationProgressTestPassedCount);
+            dataRow.createCell(48).setCellValue(certificationProgressTestFailedCount);
 //            dataRow.createCell(46).setCellValue(certificationProgressNotSubmitCount);
 //            dataRow.createCell(47).setCellValue(certificationProgressReportSubmitCount);
 //            dataRow.createCell(48).setCellValue(certificationProgressStoredCount);
-            cell = dataRow.createCell(42);
+            cell = dataRow.createCell(49);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(certificationProgressPercentage.replace("%",""))/100);
-            dataRow.createCell(43).setCellValue(certificationSubmissionStr);
+            dataRow.createCell(50).setCellValue(certificationSubmissionStr);
 
 
             List<ParamsManifestEO> pmEos = pmEoList.stream().filter(pmEo -> {
@@ -1181,6 +1218,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     return flag;
                 }).collect(Collectors.toList());
 
+                //参数收集进度
                 Map<String, Object> parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritory(pcmEos,null);
                 Map<String, Object> notStartMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.NOT_START.getValue());
                 notStartAmount = (double) notStartMap.get("amount");
@@ -1196,15 +1234,15 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 double parameterCollectingPercentage = (completionCount / parameterCollectingCount) * 100;
                 parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
             }
-            dataRow.createCell(44).setCellValue(notStartAmount);
-            dataRow.createCell(45).setCellValue(collectingAmount);
-            dataRow.createCell(46).setCellValue(submitAmount);
-            dataRow.createCell(47).setCellValue(syncReporAmount);
-            cell = dataRow.createCell(48);
+            dataRow.createCell(51).setCellValue(notStartAmount);
+            dataRow.createCell(52).setCellValue(collectingAmount);
+            dataRow.createCell(53).setCellValue(submitAmount);
+            dataRow.createCell(54).setCellValue(syncReporAmount);
+            cell = dataRow.createCell(55);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(parameterCollectingPercentageStr)/100);
-            dataRow.createCell(49).setCellValue(certificationSubmissionStr);
+            dataRow.createCell(56).setCellValue(certificationSubmissionStr);
             dataIndex ++;
 
             log.info("11111处理"+ dataIndex +"个项目消耗时间：" + (System.currentTimeMillis() - startTime));