diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index e551c2282..1092df44a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -545,5 +545,5 @@ public class ProjectLawsInventoryEO implements Serializable { private List projectLawsInventoryEOS; @TableField(exist = false) - private String platformIds;//项目名称 + private String platformIds;//平台件数据id } 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 7ac8b589b..b70756479 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 @@ -12191,9 +12191,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lawsInventoryPlatformEOS = lawsInventoryPlatformEOService.list(wrapper); List idList = new ArrayList<>(); List projectLawsInventoryEOList = new ArrayList<>(); + List projectLibraryBaseList = new ArrayList<>(); if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOS)){ idList = lawsInventoryPlatformEOS.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList()); projectLawsInventoryEOList = this.listByIds(idList); + if(ObjectUtils.isNotEmpty(projectLawsInventoryEOList)){ + List projectIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).collect(Collectors.toList()); + projectLibraryBaseList = projectLibraryBaseService.listByIds(projectIdList); + } List userIdList = new ArrayList<>(); List collect1 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList()); List collect2 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList()); @@ -12228,6 +12233,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl libraryBaseList = projectLibraryBaseList.stream() + .filter(e -> e.getId().equals(projectLawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(libraryBaseList)){ + projectLawsInventoryEO.setProjectName(libraryBaseList.get(0).getProjectNameId()); + } //流程状态 String flowStatus = ""; if(FlowFlagEnum.DESIGN.getValue().equals(flowFlag)){//流程标识,点击设计符合性流程状态跳转