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

Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

Browse Source
This commit is contained in:
gaosong
2023-12-27 16:45:14 +08:00
parent c16279ec56 0378e72eb6
commit 3c0d405315
1 changed files with 7 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/ProjectLibraryBaseServiceImpl.java
+7 -3
View File
@@ -2722,10 +2722,14 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
private List<ProjectCertificationInventoryEO> getProjectCertificationInventoryEOS(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList) {
//认证清单关联平台件（实际是一个认证清单只关联一个平台件）
List<String> projectCertificationInventoryIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList());
List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
if(ObjectUtils.isNotEmpty(projectCertificationInventoryIdList)){
LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,projectCertificationInventoryIdList);
lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper);
}
//认证清单关联的平台件
LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,projectCertificationInventoryIdList);
List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper);
List<ProjectCertificationInventoryEO> projectCertificationInventoryEOListTemp = new ArrayList<>();
List<ProjectCertificationInventoryEO> yesList = new ArrayList<>();
List<ProjectCertificationInventoryEO> noList = new ArrayList<>();