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<>();