From c9f1b77141479793645be2499b3306c8143b7c78 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 26 Oct 2023 14:04:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 35 +++++----- ...formProjectLawsInventoryEOServiceImpl.java | 66 ++++++++++--------- 2 files changed, 54 insertions(+), 47 deletions(-) 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 27ad2eae7..3c88d8d1a 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 @@ -57,7 +57,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.ProjectRelatedPersonnelMapper; import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService; @@ -80,7 +79,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; @@ -3376,7 +3374,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI public List> getTaskToConfirmStatistics(List pciEoList) { List> result = new ArrayList<>(); - int listToBeReleasedCount = 0;//清单待发布 +// int listToBeReleasedCount = 0;//清单待发布 int taskToBeInitiatedCount = 0;//任务待发起 int taskToBeConfirmedCount = 0;//任务待确认 int acceptedCount = 0;//责任人接受 @@ -3384,13 +3382,13 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if(CollectionUtils.isNotEmpty(pciEoList)){ // 清单待发布 - 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()) - ); - return flag; - }).count(); +// 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()) +// ); +// return flag; +// }).count(); // 任务待发起 taskToBeInitiatedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( @@ -3424,14 +3422,14 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI }).count(); } - Map listToBeReleasedMap = new HashMap<>(); +// Map listToBeReleasedMap = new HashMap<>(); Map taskToBeInitiatedMap = new HashMap<>(); Map taskToBeConfirmedMap = new HashMap<>(); Map acceptedMap = new HashMap<>(); Map rejectedMap = new HashMap<>(); - listToBeReleasedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); - listToBeReleasedMap.put("taskAffirmStatusCount",listToBeReleasedCount); +// listToBeReleasedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); +// listToBeReleasedMap.put("taskAffirmStatusCount",listToBeReleasedCount); taskToBeInitiatedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); taskToBeInitiatedMap.put("taskAffirmStatusCount",taskToBeInitiatedCount); @@ -3445,7 +3443,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI rejectedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()); rejectedMap.put("taskAffirmStatusCount",rejectedCount); - result.add(listToBeReleasedMap); +// result.add(listToBeReleasedMap); result.add(taskToBeInitiatedMap); result.add(taskToBeConfirmedMap); result.add(acceptedMap); @@ -3467,11 +3465,14 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI // 任务待确认 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()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()) +// 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()) +// || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()) ); return flag; }).count(); 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 e75fcc0ab..6d0b819b8 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 @@ -10045,20 +10045,20 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - int listToBeReleasedCount = 0;//清单待发布 +// 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.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - ); - return flag; - }).count(); +// 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()) +// ); +// return flag; +// }).count(); // 任务待发起 taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { @@ -10097,14 +10097,14 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl listToBeReleasedMap = new HashMap<>();//清单待发布 +// 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",listToBeReleasedCount); +// listToBeReleasedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); +// listToBeReleasedMap.put("designTaskAffirmStatusCount",listToBeReleasedCount); taskToBeInitiatedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); taskToBeInitiatedMap.put("designTaskAffirmStatusCount",taskToBeInitiatedCount); @@ -10118,7 +10118,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - int listToBeReleasedCount = 0;//清单待发布 +// 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.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - ); - return flag; - }).count(); +// listToBeReleasedCount = (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()) +// ); +// return flag; +// }).count(); // 任务待发起 taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { @@ -10181,14 +10181,14 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl listToBeReleasedMap = new HashMap<>();//清单待发布 +// 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",listToBeReleasedCount); +// listToBeReleasedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); +// listToBeReleasedMap.put("verifyTaskAffirmStatusCount",listToBeReleasedCount); taskToBeInitiatedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); taskToBeInitiatedMap.put("verifyTaskAffirmStatusCount",taskToBeInitiatedCount); @@ -10202,7 +10202,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl { 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.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.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; @@ -10424,11 +10427,14 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl { 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()) + StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) +// 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()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) ); return flag; From 15acd8004f84a0318876c3712914a19648dde8ab Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 26 Oct 2023 14:42:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95--=E7=8A=B6=E6=80=81=E5=A4=9A?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index b852a6c70..c447b23a5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -763,8 +763,19 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl