diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java index e12e83503..6157f7ba7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java @@ -264,7 +264,21 @@ public interface IPlatformProjectLawsInventoryEOService extends IService> getTaskToConfirmStatistics(List projectLawsInventoryEOList); +// List> getTaskToConfirmStatistics(List projectLawsInventoryEOList); + + /** + * 设计任务确认 + * @param projectLawsInventoryEOList + * @return + */ + List> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList); + + /** + * 验证任务确认 + * @param projectLawsInventoryEOList + * @return + */ + List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList); /** * 获取设计符合性统计信息 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index e01abb68b..e7fc3cdd6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -3376,28 +3376,36 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI public List> getTaskToConfirmStatistics(List pciEoList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int acceptedCount = 0; - int rejectedCount = 0; + int listToBeReleasedCount = 0;//清单待发布 + int taskToBeInitiatedCount = 0;//任务待发起 + int taskToBeConfirmedCount = 0;//任务待确认 + int acceptedCount = 0;//责任人接受 + int rejectedCount = 0;//责任人拒绝 + if(CollectionUtils.isNotEmpty(pciEoList)){ - // 未发起 - notStartedCount = (int) pciEoList.stream().filter(pciEo -> { + // 清单待发布 + listToBeReleasedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) pciEoList.stream().filter(pciEo -> { + // 任务待发起 + taskToBeInitiatedCount = (int) pciEoList.stream().filter(pciEo -> { + boolean flag = ( + StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + ); + return flag; + }).count(); + // 任务待确认 + taskToBeConfirmedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); return flag; }).count(); - // 接受 + // 责任人接受 acceptedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) @@ -3407,7 +3415,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI ); return flag; }).count(); - // 拒绝 + // 责任人拒绝 rejectedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()) @@ -3415,25 +3423,31 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); + + Map listToBeReleasedMap = new HashMap<>(); + Map taskToBeInitiatedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); Map acceptedMap = new HashMap<>(); Map rejectedMap = new HashMap<>(); - notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("taskAffirmStatusCount",notStartedCount); + listToBeReleasedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("taskAffirmStatusCount",listToBeReleasedCount); - toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); + taskToBeInitiatedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("taskAffirmStatusCount",taskToBeInitiatedCount); - acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue()); + taskToBeConfirmedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("taskAffirmStatusCount",taskToBeConfirmedCount); + + acceptedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.ACCEPTED_OF_RESPONSIBLE_PERSON.getValue()); acceptedMap.put("taskAffirmStatusCount",acceptedCount); - rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue()); + rejectedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()); rejectedMap.put("taskAffirmStatusCount",rejectedCount); - result.add(notStartedMap); - result.add(toConfirmMap); + result.add(listToBeReleasedMap); + result.add(taskToBeInitiatedMap); + result.add(taskToBeConfirmedMap); result.add(acceptedMap); result.add(rejectedMap); return result; @@ -3443,13 +3457,15 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI public List> getPrehomoStatistice(List pciEoList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int acceptedCount = 0; - int rejectedCount = 0; + int taskToBeConfirmedCount = 0;//任务待确认 + int resultsToBeSubmittedCount = 0;//结果待提交 + int resultsToBeReviewedCount = 0;//结果待审查 + int reviewAndPassCount = 0;//审查通过 + int reviewAndReturnCount = 0;//审查退回 + if(CollectionUtils.isNotEmpty(pciEoList)){ - // 未发起 - notStartedCount = (int) pciEoList.stream().filter(pciEo -> { + // 任务待确认 + taskToBeConfirmedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()) @@ -3459,51 +3475,61 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) pciEoList.stream().filter(pciEo -> { + // 结果待提交 + resultsToBeSubmittedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) + ); + return flag; + }).count(); + // 结果待审查 + resultsToBeReviewedCount = (int) pciEoList.stream().filter(pciEo -> { + boolean flag = ( + StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) ); return flag; }).count(); // 审查通过 - acceptedCount = (int) pciEoList.stream().filter(pciEo -> { + reviewAndPassCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()) ); return flag; }).count(); // 审查退回 - rejectedCount = (int) pciEoList.stream().filter(pciEo -> { + reviewAndReturnCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()) ); return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); + Map resultsToBeSubmittedMap = new HashMap<>(); + Map resultsToBeReviewedMap = new HashMap<>(); + Map reviewAndPassMap = new HashMap<>(); + Map reviewAndReturnMap = new HashMap<>(); - notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("taskAffirmStatusCount",notStartedCount); + taskToBeConfirmedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("taskAffirmStatusCount",taskToBeConfirmedCount); - toConfirmMap.put("taskAffirmStatus", TodoCenterStatusEnum.TO_SUBMIT.getValue()); -// toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); + resultsToBeSubmittedMap.put("taskAffirmStatus", CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + resultsToBeSubmittedMap.put("taskAffirmStatusCount",resultsToBeSubmittedCount); - acceptedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); - acceptedMap.put("taskAffirmStatusCount",acceptedCount); + resultsToBeReviewedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + resultsToBeReviewedMap.put("taskAffirmStatusCount",resultsToBeReviewedCount); - rejectedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); - rejectedMap.put("taskAffirmStatusCount",rejectedCount); + reviewAndPassMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); + reviewAndPassMap.put("taskAffirmStatusCount",reviewAndPassCount); - result.add(notStartedMap); - result.add(toConfirmMap); - result.add(acceptedMap); - result.add(rejectedMap); + reviewAndReturnMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); + reviewAndReturnMap.put("taskAffirmStatusCount",reviewAndReturnCount); + + result.add(taskToBeConfirmedMap); + result.add(resultsToBeSubmittedMap); + result.add(resultsToBeReviewedMap); + result.add(reviewAndPassMap); + result.add(reviewAndReturnMap); return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index f25ae55b1..bf7fc3a09 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -10026,139 +10026,314 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl> getTaskToConfirmStatistics(List projectLawsInventoryEOList) { + public List> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int acceptedCount = 0; - int rejectedCount = 0; + int listToBeReleasedCount = 0;//清单待发布 + int taskToBeInitiatedCount = 0;//任务待发起 + int taskToBeConfirmedCount = 0;//任务待确认 + int acceptedCount = 0;//责任人接收 + int rejectedCount = 0;//责任人拒绝 if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ - // 未发起 - int designNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 清单待发布 + listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) ); return flag; }).count(); - int verifyNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - ); - return flag; - }).count(); - notStartedCount = designNotStartedCount + verifyNotStartedCount; - // 待确认 - int designToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 任务待发起 + taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + ); + return flag; + }).count(); + + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); return flag; }).count(); - int verifyToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - ); - return flag; - }).count(); - toConfirmCount = designToConfirmCount + verifyToConfirmCount; - // 接受 - int designAcceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 责任人接收 + acceptedCount = (int) projectLawsInventoryEOList.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.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()) ); return flag; }).count(); - int verifyAcceptedCount = (int) projectLawsInventoryEOList.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()) - ); - return flag; - }).count(); - acceptedCount = designAcceptedCount + verifyAcceptedCount; - // 拒绝 - int designRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 责任人拒绝 + rejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) ); return flag; }).count(); - int verifyRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) - ); - return flag; - }).count(); - rejectedCount = designRejectedCount + verifyRejectedCount; } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map listToBeReleasedMap = new HashMap<>();//清单待发布 + Map taskToBeInitiatedMap = new HashMap<>();//任务待发起 + Map taskToBeConfirmedMap = new HashMap<>();//任务待确认 + Map acceptedMap = new HashMap<>();//责任人接收 + Map rejectedMap = new HashMap<>();//责任人拒绝 - notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("taskAffirmStatusCount",notStartedCount); + listToBeReleasedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("designTaskAffirmStatusCount",rejectedCount); - toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); + taskToBeInitiatedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("designTaskAffirmStatusCount",rejectedCount); - acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue()); - acceptedMap.put("taskAffirmStatusCount",acceptedCount); + taskToBeConfirmedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("designTaskAffirmStatusCount",rejectedCount); - rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue()); - rejectedMap.put("taskAffirmStatusCount",rejectedCount); + acceptedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_ACCEPTED.getValue()); + acceptedMap.put("designTaskAffirmStatusCount",rejectedCount); - result.add(notStartedMap); - result.add(toConfirmMap); + rejectedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()); + rejectedMap.put("designTaskAffirmStatusCount",rejectedCount); + + result.add(listToBeReleasedMap); + result.add(taskToBeInitiatedMap); + result.add(taskToBeConfirmedMap); result.add(acceptedMap); result.add(rejectedMap); return result; } - @Override - public List> getDesignComplianceStatistice(List projectLawsInventoryEOList) { + public List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int complianceCount = 0; - int nonComplianceCount = 0; + int listToBeReleasedCount = 0;//清单待发布 + int taskToBeInitiatedCount = 0;//任务待发起 + int taskToBeConfirmedCount = 0;//任务待确认 + int acceptedCount = 0;//责任人接收 + int rejectedCount = 0;//责任人拒绝 if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ - // 未发起 - notStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 清单待发布 + listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) -// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 任务待发起 + taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + ); + return flag; + }).count(); + + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + ); + return flag; + }).count(); + + // 责任人接收 + acceptedCount = (int) projectLawsInventoryEOList.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.TASK_TO_BE_CONFIRMED.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()) + ); + return flag; + }).count(); + + // 责任人拒绝 + rejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) + ); + return flag; + }).count(); + } + + Map listToBeReleasedMap = new HashMap<>();//清单待发布 + Map taskToBeInitiatedMap = new HashMap<>();//任务待发起 + Map taskToBeConfirmedMap = new HashMap<>();//任务待确认 + Map acceptedMap = new HashMap<>();//责任人接收 + Map rejectedMap = new HashMap<>();//责任人拒绝 + + listToBeReleasedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + taskToBeInitiatedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + taskToBeConfirmedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + acceptedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_ACCEPTED.getValue()); + acceptedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + rejectedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()); + rejectedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + result.add(listToBeReleasedMap); + result.add(taskToBeInitiatedMap); + result.add(taskToBeConfirmedMap); + result.add(acceptedMap); + result.add(rejectedMap); + return result; + } +// @Override +// public List> getTaskToConfirmStatistics(List projectLawsInventoryEOList) { +// List> result = new ArrayList<>(); +// +// int notStartedCount = 0; +// int toConfirmCount = 0; +// int acceptedCount = 0; +// int rejectedCount = 0; +// if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ +// // 未发起 +// int designNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) +// ); +// return flag; +// }).count(); +// int verifyNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) +// ); +// return flag; +// }).count(); +// notStartedCount = designNotStartedCount + verifyNotStartedCount; +// +// // 待确认 +// int designToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// ); +// return flag; +// }).count(); +// int verifyToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// ); +// return flag; +// }).count(); +// toConfirmCount = designToConfirmCount + verifyToConfirmCount; +// +// // 接受 +// int designAcceptedCount = (int) projectLawsInventoryEOList.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()) +// ); +// return flag; +// }).count(); +// int verifyAcceptedCount = (int) projectLawsInventoryEOList.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()) +// ); +// return flag; +// }).count(); +// acceptedCount = designAcceptedCount + verifyAcceptedCount; +// +// // 拒绝 +// int designRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) +// ); +// return flag; +// }).count(); +// int verifyRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) +// ); +// return flag; +// }).count(); +// rejectedCount = designRejectedCount + verifyRejectedCount; +// } +// +// Map notStartedMap = new HashMap<>(); +// Map toConfirmMap = new HashMap<>(); +// Map acceptedMap = new HashMap<>(); +// Map rejectedMap = new HashMap<>(); +// +// notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); +// notStartedMap.put("taskAffirmStatusCount",notStartedCount); +// +// toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); +// toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); +// +// acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue()); +// acceptedMap.put("taskAffirmStatusCount",acceptedCount); +// +// rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue()); +// rejectedMap.put("taskAffirmStatusCount",rejectedCount); +// +// result.add(notStartedMap); +// result.add(toConfirmMap); +// result.add(acceptedMap); +// result.add(rejectedMap); +// return result; +// } + + @Override + public List> getDesignComplianceStatistice(List projectLawsInventoryEOList) { + List> result = new ArrayList<>(); + int taskToBeConfirmedCount = 0;//任务待确认 + int resultsToBeSubmittedCount = 0;//结果待提交 + int resultsToBeReviewedCount = 0;//结果待审查 + int complianceCount = 0;//符合 + int nonComplianceCount = 0;//不符合 + int toBeTrackedCount = 0;//待追踪 + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) + + ); + return flag; + }).count(); + + // 结果待提交 + resultsToBeSubmittedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + ); + return flag; + }).count(); + + // 结果待审查 + resultsToBeReviewedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) ); return flag; }).count(); @@ -10170,69 +10345,91 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + ); + return flag; + }).count(); + // 待追踪 + toBeTrackedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) ); return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); + Map resultsToBeSubmittedMap = new HashMap<>(); + Map resultsToBeReviewedMap = new HashMap<>(); + Map complianceMap = new HashMap<>(); + Map nonComplianceMap = new HashMap<>(); + Map toBeTrackedMap = new HashMap<>(); - notStartedMap.put("designFlowTaskStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("designFlowTaskStatusCount",notStartedCount); + taskToBeConfirmedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("designFlowTaskStatusCount",taskToBeConfirmedCount); - toConfirmMap.put("designFlowTaskStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("designFlowTaskStatusCount",toConfirmCount); + resultsToBeSubmittedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + resultsToBeSubmittedMap.put("designFlowTaskStatusCount",resultsToBeSubmittedCount); - acceptedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); - acceptedMap.put("designFlowTaskStatusCount",complianceCount); + resultsToBeReviewedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + resultsToBeReviewedMap.put("designFlowTaskStatusCount",resultsToBeReviewedCount); - rejectedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); - rejectedMap.put("designFlowTaskStatusCount",nonComplianceCount); + complianceMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); + complianceMap.put("designFlowTaskStatusCount",complianceCount); - result.add(notStartedMap); - result.add(toConfirmMap); - result.add(acceptedMap); - result.add(rejectedMap); + nonComplianceMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); + nonComplianceMap.put("designFlowTaskStatusCount",nonComplianceCount); + + toBeTrackedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.TO_TRACK.getValue()); + toBeTrackedMap.put("designFlowTaskStatusCount",toBeTrackedCount); + + result.add(taskToBeConfirmedMap); + result.add(resultsToBeSubmittedMap); + result.add(resultsToBeReviewedMap); + result.add(complianceMap); + result.add(nonComplianceMap); + result.add(toBeTrackedMap); return result; } @Override public List> getVerifyComplianceStatistice(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - - int notStartedCount = 0; - int toConfirmCount = 0; - int complianceCount = 0; - int nonComplianceCount = 0; + int taskToBeConfirmedCount = 0;//任务待确认 + int resultsToBeSubmittedCount = 0;//结果待提交 + int resultsToBeReviewedCount = 0;//结果待审查 + int complianceCount = 0;//符合 + int nonComplianceCount = 0;//不符合 + int toBeTrackedCount = 0;//待追踪 if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ - // 未发起 - notStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) -// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) + ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 结果待提交 + resultsToBeSubmittedCount = (int) projectLawsInventoryEOList.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.TASK_TO_BE_CONFIRMED.getValue()) -// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + ); + return flag; + }).count(); + + // 结果待审查 + resultsToBeReviewedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) ); return flag; }).count(); @@ -10240,42 +10437,57 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) ); return flag; }).count(); - // 不符合 nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + ); + return flag; + }).count(); + // 待追踪 + toBeTrackedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) ); return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); + Map resultsToBeSubmittedMap = new HashMap<>(); + Map resultsToBeReviewedMap = new HashMap<>(); + Map complianceMap = new HashMap<>(); + Map nonComplianceMap = new HashMap<>(); + Map toBeTrackedMap = new HashMap<>(); - notStartedMap.put("verifyFlowTaskStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("verifyFlowTaskStatusCount",notStartedCount); + taskToBeConfirmedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("verifyFlowTaskStatusCount",taskToBeConfirmedCount); - toConfirmMap.put("verifyFlowTaskStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("verifyFlowTaskStatusCount",toConfirmCount); + resultsToBeSubmittedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + resultsToBeSubmittedMap.put("verifyFlowTaskStatusCount",resultsToBeSubmittedCount); - acceptedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); - acceptedMap.put("verifyFlowTaskStatusCount",complianceCount); + resultsToBeReviewedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + resultsToBeReviewedMap.put("verifyFlowTaskStatusCount",resultsToBeReviewedCount); - rejectedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); - rejectedMap.put("verifyFlowTaskStatusCount",nonComplianceCount); + complianceMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); + complianceMap.put("verifyFlowTaskStatusCount",complianceCount); - result.add(notStartedMap); - result.add(toConfirmMap); - result.add(acceptedMap); - result.add(rejectedMap); + nonComplianceMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); + nonComplianceMap.put("verifyFlowTaskStatusCount",nonComplianceCount); + + toBeTrackedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.TO_TRACK.getValue()); + toBeTrackedMap.put("verifyFlowTaskStatusCount",toBeTrackedCount); + + result.add(taskToBeConfirmedMap); + result.add(resultsToBeSubmittedMap); + result.add(resultsToBeReviewedMap); + result.add(complianceMap); + result.add(nonComplianceMap); + result.add(toBeTrackedMap); return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java index 3290c76af..9f5335a0a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java @@ -1600,6 +1600,10 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl certificationProgressMap = new HashMap<>(); // 认证任务确认 Map rzTaskToConfirmMap = new HashMap<>(); + //设计任务确认 + Map designTaskToConfirmMap = new HashMap<>(); + //验证任务确认 + Map verifyTaskToConfirmMap = new HashMap<>(); //清单确认统计 /*List> listingToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); @@ -1613,17 +1617,43 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); //任务确认统计 - List> taskToConfirmMapList = this.platformProjectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); - int taskAffirmStatusCount = 0; - if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){ +// List> taskToConfirmMapList = this.platformProjectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); +// int taskAffirmStatusCount = 0; +// if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){ +// //taskAffirmStatusCount +// for (Map taskToConfirm : taskToConfirmMapList) { +// taskAffirmStatusCount += (int) taskToConfirm.get("taskAffirmStatusCount"); +// } +// } +// taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); +// taskToConfirmMap.put("count",taskAffirmStatusCount); +// result.put("taskToConfirmMap",taskToConfirmMap); + + //设计任务确认 + List> designTaskToConfirmMapList = this.platformProjectLawsInventoryEOService.getDesignTaskToConfirmStatistics(projectLawsInventoryEOList); + int designTaskAffirmStatusCount = 0; + if(CollectionUtils.isNotEmpty(designTaskToConfirmMapList)){ //taskAffirmStatusCount - for (Map taskToConfirm : taskToConfirmMapList) { - taskAffirmStatusCount += (int) taskToConfirm.get("taskAffirmStatusCount"); + for (Map taskToConfirm : designTaskToConfirmMapList) { + designTaskAffirmStatusCount += (int) taskToConfirm.get("designTaskAffirmStatusCount"); } } - taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); - taskToConfirmMap.put("count",taskAffirmStatusCount); - result.put("taskToConfirmMap",taskToConfirmMap); + designTaskToConfirmMap.put("designTaskToConfirmMapList",designTaskToConfirmMapList); + designTaskToConfirmMap.put("count",designTaskAffirmStatusCount); + result.put("designTaskToConfirmMap",designTaskToConfirmMap); + + //验证任务确认 + List> verifyTaskToConfirmMapList = this.platformProjectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(projectLawsInventoryEOList); + int verifyTaskAffirmStatusCount = 0; + if(CollectionUtils.isNotEmpty(verifyTaskToConfirmMapList)){ + //taskAffirmStatusCount + for (Map taskToConfirm : verifyTaskToConfirmMapList) { + verifyTaskAffirmStatusCount += (int) taskToConfirm.get("verifyTaskAffirmStatusCount"); + } + } + verifyTaskToConfirmMap.put("verifyTaskToConfirmMapList",verifyTaskToConfirmMapList); + verifyTaskToConfirmMap.put("count",verifyTaskAffirmStatusCount); + result.put("verifyTaskToConfirmMap",verifyTaskToConfirmMap); //设计符合性