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 d88420ee8..d6e667f79 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 @@ -1396,8 +1396,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl sysUserList = this.sysUserService.querySysUserListByIdList(userIdList); - + List standIdList = datas.stream().map(ProjectCertificationInventoryEO::getBussDocumentLibraryId).distinct().collect(Collectors.toList()); + List docList = iBussDocumentLibraryEOService.listByIds(standIdList); for (ProjectCertificationInventoryEO data : datas) { + //处理编号,认证清单中若状态为符合时则编号标题不再随文档库变化 + if (!data.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()) + && StringUtils.isNotBlank(data.getBussDocumentLibraryId())) { + BussDocumentLibraryEO docObj = null; + for (BussDocumentLibraryEO obj : docList) { + if (obj.getId().equals(data.getBussDocumentLibraryId())) { + docObj = obj; + break; + } + } + if(null != docObj){ + data.setSerialNumber(docObj.getSerialNumber()); + } + } if(StringUtils.isNotEmpty(data.getSdt())){ String sdtName = sysUserList.stream().filter(sysUser -> { boolean flag = false; 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 01438f915..d5d2ca6fe 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 @@ -1556,7 +1556,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl standIdList = list.stream().map(ProjectLawsInventoryEO::getStandId).distinct().collect(Collectors.toList()); + List docList = bussDocumentLibraryEOService.listByIds(standIdList); for (ProjectLawsInventoryEO projectLawsInventoryEO : list) { + //处理编号,法规清单中若状态为符合时则编号标题不再随文档库变化 + if ((!projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue()) + || !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue())) + && StringUtils.isNotBlank(projectLawsInventoryEO.getStandId())) { + BussDocumentLibraryEO docObj = null; + for (BussDocumentLibraryEO obj : docList) { + if (obj.getId().equals(projectLawsInventoryEO.getStandId())) { + docObj = obj; + break; + } + } + if(null != docObj){ + projectLawsInventoryEO.setSerialNumber(docObj.getSerialNumber()); + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + projectLawsInventoryEO.setTitle(docObj.getTitle()); + } else { + projectLawsInventoryEO.setTitle(docObj.getTitleEn()); + } + } + } //处理交付物类型 String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType(); String prehomoDeliverableType = projectLawsInventoryEO.getPrehomoDeliverableType();