认证清单-关联平台件后,列表展示平台件数据
This commit is contained in:
+26
-3
@@ -1986,14 +1986,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
|
||||
List<ProjectCertificationInventoryEO> certificationInventoryEOS = projectCertificationInventoryEOS.stream()
|
||||
.filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
|
||||
if(!certificationInventoryEOS.isEmpty()){
|
||||
setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO);
|
||||
}
|
||||
|
||||
List<ProjectLibraryBase> 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<Proj
|
||||
|
||||
private void setProjectCertificationInventoryEO(ProjectCertificationInventoryEO certificationInventoryEO,
|
||||
ProjectCertificationInventoryEO projectCertificationInventoryEO) {
|
||||
//类别 category
|
||||
projectCertificationInventoryEO.setCategory(StringUtils.isNotEmpty(certificationInventoryEO.getCategory()) ? certificationInventoryEO.getCategory() : "");
|
||||
//检验项目 inspectionItem
|
||||
projectCertificationInventoryEO.setInspectionItem(StringUtils.isNotEmpty(certificationInventoryEO.getInspectionItem()) ? certificationInventoryEO.getInspectionItem() : "");
|
||||
//认证类型 attestationType
|
||||
projectCertificationInventoryEO.setAttestationType(StringUtils.isNotEmpty(certificationInventoryEO.getAttestationType()) ? certificationInventoryEO.getAttestationType() : "");
|
||||
//WVTA ID wvtaId
|
||||
projectCertificationInventoryEO.setWvtaId(StringUtils.isNotEmpty(certificationInventoryEO.getWvtaId()) ? certificationInventoryEO.getWvtaId() : "");
|
||||
//标准编号 serialNumber
|
||||
projectCertificationInventoryEO.setSerialNumber(StringUtils.isNotEmpty(certificationInventoryEO.getSerialNumber()) ? certificationInventoryEO.getSerialNumber() : "");
|
||||
//责任部门 dutyDepart
|
||||
projectCertificationInventoryEO.setDutyDepart(StringUtils.isNotEmpty(certificationInventoryEO.getDutyDepart()) ? certificationInventoryEO.getDutyDepart() : "");
|
||||
//责任领域 firstLevelDutyTerritory
|
||||
projectCertificationInventoryEO.setFirstLevelDutyTerritory(StringUtils.isNotEmpty(certificationInventoryEO.getFirstLevelDutyTerritory()) ? certificationInventoryEO.getFirstLevelDutyTerritory() : "");
|
||||
//工程接口人 sdt
|
||||
projectCertificationInventoryEO.setSdt(StringUtils.isNotEmpty(certificationInventoryEO.getSdt()) ? certificationInventoryEO.getSdt() : "");
|
||||
//责任人 dutyPerson
|
||||
projectCertificationInventoryEO.setDutyPerson(StringUtils.isNotEmpty(certificationInventoryEO.getDutyPerson()) ? certificationInventoryEO.getDutyPerson() : "");
|
||||
|
||||
//交付物模板-deliverableTemplate
|
||||
projectCertificationInventoryEO.setDeliverableTemplate(StringUtils.isNotEmpty(certificationInventoryEO.getDeliverableTemplate()) ? certificationInventoryEO.getDeliverableTemplate() : "");
|
||||
//交付物类型-deliverableType
|
||||
|
||||
Reference in New Issue
Block a user