From a4c0e00a7a4527b7f4f9ed38766fc0b38aa75ee0 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Dec 2023 15:32:54 +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=E6=8E=92=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E-?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B1=95=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 ++-- .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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 7c4f1c26b..7cea3f0c8 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 @@ -76,7 +76,7 @@ import com.jero.modules.project.enums.DataEnum; import com.jero.modules.project.enums.DataSourceEnum; import com.jero.modules.project.enums.DesignComplianceStatusEnum; import com.jero.modules.project.enums.FlowFlagEnum; -import com.jero.modules.project.enums.FlowStateEnum; +import com.jero.modules.project.enums.FlowStateDesignEnum; import com.jero.modules.project.enums.InventoryAffirmNodeEnum; import com.jero.modules.project.enums.InventoryAffirmStatusEnum; import com.jero.modules.project.enums.JumpLinkEnum; @@ -12314,7 +12314,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl result) { - List valueList = FlowStateEnum.getValueInfo(); + List valueList = FlowStateDesignEnum.getValueInfo();//修改为按高嵩提供的流程顺序 List lawsInventoryPlatformEOList = new ArrayList<>(); List projectLawsInventoryEOS = new ArrayList<>(); 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 b9376ae51..24e00bfe9 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 @@ -2720,6 +2720,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl getProjectCertificationInventoryEOS(List projectCertificationInventoryEOList) { + //认证清单关联平台件（实际是一个认证清单只关联一个平台件） List projectCertificationInventoryIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList()); //认证清单关联的平台件 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();