From d4c4f2305ad9178ebb205982583b2ca47305a855 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 21 Sep 2023 19:25:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E5=85=B3=E8=81=94=E4=BA=86=E5=B9=B3=E5=8F=B0=E4=BB=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8C=89=E5=B9=B3=E5=8F=B0=E4=BB=B6=E4=B8=AD=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E9=A1=BA=E5=BA=8F=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/FlowStateEnum.java | 66 +++++++++++++++++++ .../ProjectLawsInventoryEOServiceImpl.java | 31 +++++++-- 2 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java new file mode 100644 index 000000000..2425ed44d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java @@ -0,0 +1,66 @@ +package com.jero.modules.project.enums; + +import java.util.LinkedList; +import java.util.List; + +/** + * 消息类型枚举类 + */ +public enum FlowStateEnum { + INCONFORMITY("不符合","Non-Compliance","Non-Compliance"), + TO_TRACK("待追踪","To be tracked","To be tracked"), + CONFORMITY("符合","Compliance","Compliance"), + UNINVOLVED("不涉及","NA","NA"), + LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"), + LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"), + REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"), + REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Refusal of responsible person"), + 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"), + + ; + + String nameCn; + String nameEn; + String value; + + private FlowStateEnum(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<>(); + FlowStateEnum[] values = values(); + for (FlowStateEnum 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/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index ca601940e..e07916a03 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 @@ -11735,6 +11735,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl result) { + List valueList = FlowStateEnum.getValueInfo(); List lawsInventoryPlatformEOList = new ArrayList<>(); List projectLawsInventoryEOS = new ArrayList<>(); @@ -11756,8 +11757,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect1 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList()); List collect2 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList()); - List collect3 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList()); - List collect4 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList()); + List collect3 = projectLawsInventoryEOS.stream().filter(e->StringUtils.isNotBlank(e.getDesignDeliverableTemplate())).map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList()); + List collect4 = projectLawsInventoryEOS.stream().filter(e->StringUtils.isNotBlank(e.getVerifyDeliverableTemplate())).map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList()); if(!collect1.isEmpty()){ userIdList.addAll(collect1); } @@ -11798,6 +11799,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lawsInventoryEOS = projectLawsInventoryEOS.stream() .filter(e -> idList.contains(e.getId())).collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(lawsInventoryEOS)){ + for (String value : valueList) { + List collect = lawsInventoryEOS.stream() + .filter(e -> value.equals(e.getDesignFlowStatus())).collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect)){ + lawsInventoryEO.setDesignFlowStatus(value); + break; + } + } + for (String value : valueList) { + List collect = lawsInventoryEOS.stream() + .filter(e -> value.equals(e.getVerifyFlowStatus())).collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect)){ + lawsInventoryEO.setVerifyFlowStatus(value); + break; + } + } + } lawsInventoryEO.setProjectLawsInventoryEOS(lawsInventoryEOS); if(!lawsInventoryEOS.isEmpty()){ projectLawsInventoryEOList.addAll(lawsInventoryEOS); @@ -11892,7 +11911,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl libraryBaseList = projectLibraryBaseService.list(wrapper); for (ProjectLawsInventoryEO lawsInventoryEO : result) { List lawsInventoryEOS = lawsInventoryEO.getProjectLawsInventoryEOS(); - if(!lawsInventoryEOS.isEmpty()){ + if(ObjectUtils.isNotEmpty(lawsInventoryEOS)){ for (ProjectLawsInventoryEO inventoryEO : lawsInventoryEOS) { List collect = libraryBaseList.stream().filter(e -> inventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList()); if(!collect.isEmpty()){ @@ -11904,11 +11923,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl nventoryEOList = lawsInventoryEO.getProjectLawsInventoryEOS(); - if(!nventoryEOList.isEmpty()){ + if(ObjectUtils.isNotEmpty(nventoryEOList)){ Collator comparator = Collator.getInstance(Locale.CHINESE); Collections.sort(nventoryEOList,(e1,e2)->{ - String e1ProjectName = StringUtils.isNotBlank(e1.getProjectName()) ? e1.getAttestationType() : ""; - String e2ProjectName = StringUtils.isNotBlank(e2.getProjectName()) ? e2.getAttestationType() : ""; + String e1ProjectName = StringUtils.isNotBlank(e1.getProjectName()) ? e1.getProjectName() : ""; + String e2ProjectName = StringUtils.isNotBlank(e2.getProjectName()) ? e2.getProjectName() : ""; return comparator.compare(e1ProjectName,e2ProjectName); }); lawsInventoryEO.setProjectLawsInventoryEOS(nventoryEOList);