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

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

Browse Source
This commit is contained in:
zyx.net
2023-09-27 09:31:32 +08:00
parent 7084816766 fea23ae5c4
commit 61fc2ec75c
2 changed files with 27 additions and 2 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
+21 -1
View File
@@ -1957,6 +1957,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
} }
for (ProjectCertificationInventoryEO certificationInventoryEO : result) { for (ProjectCertificationInventoryEO certificationInventoryEO : result) {
if(!projectCertificationInventoryEOS.isEmpty()){ if(!projectCertificationInventoryEOS.isEmpty()){
List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
List<LawsInventoryPlatformEO> collect = lawsInventoryPlatformEOList.stream() List<LawsInventoryPlatformEO> collect = lawsInventoryPlatformEOList.stream()
.filter(e -> certificationInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList()); .filter(e -> certificationInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList());
if(ObjectUtils.isNotEmpty(collect)){ if(ObjectUtils.isNotEmpty(collect)){
@@ -1966,6 +1967,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
List<ProjectCertificationInventoryEO> inventoryEOList = projectCertificationInventoryEOS.stream() List<ProjectCertificationInventoryEO> inventoryEOList = projectCertificationInventoryEOS.stream()
.filter(e -> platformLawsInventoryIdList.contains(e.getId())).collect(Collectors.toList()); .filter(e -> platformLawsInventoryIdList.contains(e.getId())).collect(Collectors.toList());
certificationInventoryEO.setProjectCertificationInventoryEOS(inventoryEOList); certificationInventoryEO.setProjectCertificationInventoryEOS(inventoryEOList);
if(ObjectUtils.isNotEmpty(inventoryEOList)){
List<String> projectLibraryIdList = inventoryEOList.stream()
.map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ProjectLibraryBase::getId,projectLibraryIdList);
projectLibraryBaseList = projectLibraryBaseService.list(wrapper);
}
} }
@@ -1979,6 +1989,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
if(!certificationInventoryEOS.isEmpty()){ if(!certificationInventoryEOS.isEmpty()){
setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO); 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());
}
} }
} }
} }
@@ -7191,7 +7206,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
} }
String serialNumber = projectCertificationInventoryEO.getSerialNumber(); String serialNumber = projectCertificationInventoryEO.getSerialNumber();
String dutyTerritoryName = com.jero.modules.system.util.StringUtils.join(list,","); String dutyTerritoryName = com.jero.modules.system.util.StringUtils.join(list,",");
String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据"; String msg = "";
if(CutEnum.CN.getValue().equals(cut)){
msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
}else{
msg = serialNumber+" "+dutyTerritoryName+" no data matched";
}
msgList.add(msg); msgList.add(msg);
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+6 -1
View File
@@ -1423,7 +1423,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
} }
String serialNumber = projectLawsInventoryEO.getSerialNumber(); String serialNumber = projectLawsInventoryEO.getSerialNumber();
String dutyTerritoryName = StringUtils.join(list,","); String dutyTerritoryName = StringUtils.join(list,",");
String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据"; String msg = "";
if(CutEnum.CN.getValue().equals(cut)){
msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
}else{
msg = serialNumber+" "+dutyTerritoryName+" no data matched";
}
msgList.add(msg); msgList.add(msg);
} }
} }