diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java index 211b6c269..ec640d4ef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java @@ -29,6 +29,7 @@ public enum CertificationInventoryFlowStatusEnum { CERTIFICATION_RETURNED("认证退回","Certification returned","Certification returned"), TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Refusal of responsible person"), + ACCEPTED_OF_RESPONSIBLE_PERSON("责任人接受","Accepted of responsible person","Accepted of responsible person"), RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), //ENGINEER_RETURN("工程师退回","Engineer return","Engineer return"), RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java index 6949a4ebb..204c3dee2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java @@ -11,6 +11,7 @@ public enum ComplianceFlowStatusEnum { LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"), REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"), DUTY_PERSON_REJECTED("责任人拒绝","Rejected by the responsible person","Duty Person Rejected"), + DUTY_PERSON_ACCEPTED("责任人接受","Accepted by the responsible person","Duty Person Accepted"), TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 2f2687e23..f63940732 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -264,7 +264,21 @@ public interface IProjectLawsInventoryEOService 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/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index a1522a076..713550590 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -53,7 +53,6 @@ import com.jero.modules.project.enums.ProjectMessageEnum; import com.jero.modules.project.enums.ProjectUserLocationEnum; import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.project.enums.RoleRelModelTypeEnum; -import com.jero.modules.project.enums.TaskAffirmStatusEnum; import com.jero.modules.project.enums.TaskStatusEnum; import com.jero.modules.project.mapper.ProjectCertificationInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; @@ -83,7 +82,6 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; -import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.enums.FlowTypeEnum; @@ -3276,28 +3274,36 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> 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()) @@ -3307,7 +3313,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()) @@ -3315,25 +3321,31 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 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; @@ -3343,13 +3355,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> 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()) @@ -3359,51 +3373,61 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { + // 结果待提交 + 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/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index b1ba0d549..b253bf009 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -9996,51 +9996,154 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> 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; +// } + + /** + * 设计任务确认 + * @param projectLawsInventoryEOList + * @return + */ @Override - public List> 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()) ); 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()) @@ -10050,53 +10153,130 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { - 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 -> { + } + + Map listToBeReleasedMap = new HashMap<>();//清单待发布 + Map taskToBeInitiatedMap = new HashMap<>();//任务待发起 + Map taskToBeConfirmedMap = new HashMap<>();//任务待确认 + Map acceptedMap = new HashMap<>();//责任人接收 + Map rejectedMap = new HashMap<>();//责任人拒绝 + + listToBeReleasedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("designTaskAffirmStatusCount",rejectedCount); + + taskToBeInitiatedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("designTaskAffirmStatusCount",rejectedCount); + + taskToBeConfirmedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("designTaskAffirmStatusCount",rejectedCount); + + acceptedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_ACCEPTED.getValue()); + acceptedMap.put("designTaskAffirmStatusCount",rejectedCount); + + 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; + } + + /** + * 验证任务确认 + * @param projectLawsInventoryEOList + * @return + */ + @Override + public List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList) { + List> result = new ArrayList<>(); + + int listToBeReleasedCount = 0;//清单待发布 + int taskToBeInitiatedCount = 0;//任务待发起 + int taskToBeConfirmedCount = 0;//任务待确认 + int acceptedCount = 0;//责任人接收 + int rejectedCount = 0;//责任人拒绝 + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + // 清单待发布 + listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) + ); + return flag; + }).count(); + + // 任务待发起 + 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.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(); - 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("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("verifyTaskAffirmStatusCount",rejectedCount); - toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); + taskToBeInitiatedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("verifyTaskAffirmStatusCount",rejectedCount); - acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue()); - acceptedMap.put("taskAffirmStatusCount",acceptedCount); + taskToBeConfirmedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("verifyTaskAffirmStatusCount",rejectedCount); - rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue()); - rejectedMap.put("taskAffirmStatusCount",rejectedCount); + acceptedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_ACCEPTED.getValue()); + acceptedMap.put("verifyTaskAffirmStatusCount",rejectedCount); - result.add(notStartedMap); - result.add(toConfirmMap); + 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; @@ -10105,31 +10285,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getDesignComplianceStatistice(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.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.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.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 -> { + // 结果待提交 + resultsToBeSubmittedCount = (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.TO_TRACK.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(); @@ -10141,69 +10328,91 @@ public class ProjectLawsInventoryEOServiceImpl 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(); @@ -10211,42 +10420,57 @@ public class ProjectLawsInventoryEOServiceImpl 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/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index fccc89134..2d16cd234 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -1912,11 +1912,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl certificationProgressMap = new HashMap<>(); // 认证任务确认 Map rzTaskToConfirmMap = new HashMap<>(); - - //清单确认统计 - /*List> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); - listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList); - result.put("listingToConfirmMap",listingToConfirmMap);*/ + //设计任务确认 + Map designTaskToConfirmMap = new HashMap<>(); + //验证任务确认 + Map verifyTaskToConfirmMap = new HashMap<>(); QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(","))); @@ -1925,17 +1924,42 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); //任务确认统计 - List> taskToConfirmMapList = this.projectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); - int taskAffirmStatusCount = 0; - if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){ +// List> taskToConfirmMapList = this.projectLawsInventoryEOService.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.projectLawsInventoryEOService.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.projectLawsInventoryEOService.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); //设计符合性 List> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);