WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

67329 认证清单-引用交付物问题。

Browse Source
This commit is contained in:
wangzhijiang
2023-03-29 15:57:39 +08:00
parent e0dc515a39
commit ae76a8983a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+8 -3
View File
@@ -3854,6 +3854,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
// 没有引用的数据 检验项目集合，给到前端进行展示。
List<String> noCiteInspectionItem = new ArrayList<>();
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
String deliveryResult = "";
for (ProjectCertificationInventoryEO citeProjectCertificationInventoryEO : citeProjectCertificationInventoryEOList) {
// 匹配数据 类别、检验项目、配置项、标准编号、交付物类型完全一致，并且数据的状态为 审查完成
boolean flag = (
@@ -3863,13 +3864,17 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
&& StringUtils.equals(projectCertificationInventoryEO.getSerialNumber(),citeProjectCertificationInventoryEO.getSerialNumber())
&& StringUtils.equals(projectCertificationInventoryEO.getDeliverableType(),citeProjectCertificationInventoryEO.getDeliverableType())
);
if(flag){
projectCertificationInventoryEO.setDeliveryResult(citeProjectCertificationInventoryEO.getDeliveryResult());
deliveryResult = citeProjectCertificationInventoryEO.getDeliveryResult();
break;
}else {
noCiteInspectionItem.add(projectCertificationInventoryEO.getInspectionItem());
}
}
if(StringUtils.isNotBlank(deliveryResult)){
projectCertificationInventoryEO.setDeliveryResult(deliveryResult);
}else {
noCiteInspectionItem.add(projectCertificationInventoryEO.getInspectionItem());
}
}
this.updateBatchById(projectCertificationInventoryEOList);