From 7e64cb6af987257e93fe4f23e161df828e63f417 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Dec 2023 14:46:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6--=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8F=96=E8=BF=9B=E5=BA=A6=E6=9C=80=E6=85=A2=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/enums/FlowStateDesignEnum.java | 64 +++++++++++++++++++ .../impl/ProjectLibraryBaseServiceImpl.java | 57 ++++++++++++----- 2 files changed, 104 insertions(+), 17 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateDesignEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateDesignEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateDesignEnum.java new file mode 100644 index 000000000..7db45a64c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateDesignEnum.java @@ -0,0 +1,64 @@ +package com.jero.modules.project.enums; + +import java.util.LinkedList; +import java.util.List; + +/** + * 设计符合性确认流程状态顺序枚举类 + */ +public enum FlowStateDesignEnum { + LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"), + TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), + REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Rejected by the responsible person","Duty Person Rejected"), + RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), + RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), + TO_TRACK("待追踪","To be tracked","To be tracked"), + CONFORMITY("符合","Compliance","Compliance"), + INCONFORMITY("不符合","Non-Compliance","Non-Compliance"), + UNINVOLVED("不涉及","NA","NA"), + + ; + + String nameCn; + String nameEn; + String value; + + private FlowStateDesignEnum(String nameCn, String nameEn, String value) { + this.nameCn = nameCn; + this.nameEn = nameEn; + this.value = value; + } + + public String getNameCn() { + return nameCn; + } + + public void setNameCn(String nameCn) { + this.nameCn = nameCn; + } + + public String getNameEn() { + return nameEn; + } + + public void setNameEn(String nameEn) { + this.nameEn = nameEn; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static List getValueInfo() { + List result = new LinkedList<>(); + FlowStateDesignEnum[] values = values(); + for (FlowStateDesignEnum flowStateEnum : values) { + result.add(flowStateEnum.getValue()); + } + 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 a94a2e42a..b9376ae51 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 @@ -38,6 +38,7 @@ import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum; import com.jero.modules.project.enums.CertificationProgressEnum; import com.jero.modules.project.enums.ComplianceFlowStatusEnum; import com.jero.modules.project.enums.DesignComplianceStatusEnum; +import com.jero.modules.project.enums.FlowStateDesignEnum; import com.jero.modules.project.enums.FlowStateEnum; import com.jero.modules.project.enums.HSStatisticalNodesEnum; import com.jero.modules.project.enums.OperatorTypeEnum; @@ -2778,30 +2779,52 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(ProjectLawsInventoryEO::getId,idList); projectLawsInventoryPlatFormList = projectLawsInventoryEOMapper.selectList(queryWrapper); + List valueInfo = FlowStateDesignEnum.getValueInfo(); for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) { + //每条法规关联的平台件 List collect = lawsInventoryPlatformEOList.stream() .filter(e -> e.getLawsInventoryId().equals(projectLawsInventoryEO.getId())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(collect)){ - yesList.add(projectLawsInventoryEO); - }else{ - noList.add(projectLawsInventoryEO); + List platformLawsInventoryIdList = collect.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList()); + //关联的平台件数据 + List platformList = projectLawsInventoryPlatFormList.stream() + .filter(e -> platformLawsInventoryIdList.contains(e.getId())).collect(Collectors.toList()); + for (ProjectLawsInventoryEO lawsInventoryEO : platformList) { + for (String value : valueInfo) { + if(value.equals(lawsInventoryEO.getDesignFlowStatus())){ + projectLawsInventoryEO.setDesignFlowStatus(value); + break; + } + } + for (String value : valueInfo) { + if(value.equals(lawsInventoryEO.getVerifyFlowStatus())){ + projectLawsInventoryEO.setVerifyFlowStatus(value); + break; + } + } + } } + +// if(ObjectUtils.isNotEmpty(collect)){ +// yesList.add(projectLawsInventoryEO); +// }else{ +// noList.add(projectLawsInventoryEO); +// } } } - if(ObjectUtils.isNotEmpty(projectLawsInventoryEOList) - && ObjectUtils.isNotEmpty(yesList) - && yesList.size() != projectLawsInventoryEOList.size() - ){ - //法规清单有数据且部分关联平台件数据 - projectLawsInventoryEOList = noList; - projectLawsInventoryEOList.addAll(projectLawsInventoryPlatFormList); - }else if(ObjectUtils.isNotEmpty(projectLawsInventoryEOList) - && ObjectUtils.isNotEmpty(yesList) - && yesList.size() == projectLawsInventoryEOList.size()){ - //法规清单有数据且全部关联了平台件 - projectLawsInventoryEOList = projectLawsInventoryPlatFormList; - - } +// if(ObjectUtils.isNotEmpty(projectLawsInventoryEOList) +// && ObjectUtils.isNotEmpty(yesList) +// && yesList.size() != projectLawsInventoryEOList.size() +// ){ +// //法规清单有数据且部分关联平台件数据 +// projectLawsInventoryEOList = noList; +// projectLawsInventoryEOList.addAll(projectLawsInventoryPlatFormList); +// }else if(ObjectUtils.isNotEmpty(projectLawsInventoryEOList) +// && ObjectUtils.isNotEmpty(yesList) +// && yesList.size() == projectLawsInventoryEOList.size()){ +// //法规清单有数据且全部关联了平台件 +// projectLawsInventoryEOList = projectLawsInventoryPlatFormList; +// } return projectLawsInventoryEOList; }