diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index a583167ed..b84d9dd84 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -1986,14 +1986,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationInventoryEOS = projectCertificationInventoryEOS.stream() .filter(e -> idList.contains(e.getId())).collect(Collectors.toList()); - if(!certificationInventoryEOS.isEmpty()){ - setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO); - } + List libraryBaseList = projectLibraryBaseList.stream() .filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(libraryBaseList)){ certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId()); } + + if(!certificationInventoryEOS.isEmpty()){ + setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO); + } + + } } } @@ -7046,6 +7050,25 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl collect = lawsInventoryEOS.stream() .filter(e -> value.equals(e.getDesignFlowStatus())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(collect)){ + //流程状态 lawsInventoryEO.setDesignFlowStatus(value); break; } @@ -11755,6 +11756,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = lawsInventoryEOS.stream() .filter(e -> value.equals(e.getVerifyFlowStatus())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(collect)){ + //流程状态 lawsInventoryEO.setVerifyFlowStatus(value); break; } @@ -11838,17 +11840,42 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl