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 17b938696..3e0e5f52b 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 @@ -3143,6 +3143,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl citeDeliverable(JSONObject json) { + String resultMsg = "引用交付物成功!"; + String cut = json.getString("cut"); + String projectCertificationInventoryIds = json.getString("projectCertificationInventoryIds"); if(StringUtils.isEmpty(projectCertificationInventoryIds)){ throw new JeroBootException("请选择需要引用的认证清单数据!"); @@ -3165,6 +3168,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl citeProjectCertificationInventoryEOList = this.baseMapper.selectList(citeQueryWrapper); if(CollectionUtils.isNotEmpty(citeProjectCertificationInventoryEOList)){ + + +// citeProjectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getInspectionItem).distinct().collect(Collectors.joining(",")); +// return Result.OK("所选检验项目"+""+"暂未维护,需要进行手动填写。"); + //The review passed data in the selected reference project is empty, please reselect! + // 没有引用的数据 检验项目集合,给到前端进行展示。 + List noCiteInspectionItem = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { for (ProjectCertificationInventoryEO citeProjectCertificationInventoryEO : citeProjectCertificationInventoryEOList) { // 匹配数据 类别、检验项目、配置项、标准编号、交付物类型完全一致,并且数据的状态为 审查完成 @@ -3178,15 +3188,34 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl adds, String belong) {