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-22 16:25:33 +08:00
parent fad1e2f8ec 4ab41cab98
commit 571a5a781e
2 changed files with 11 additions and 1 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/entity/ProjectLawsInventoryEO.java
+1 -1
View File
@@ -545,5 +545,5 @@ public class ProjectLawsInventoryEO implements Serializable {
private List<ProjectLawsInventoryEO> projectLawsInventoryEOS;
@TableField(exist = false)
private String platformIds;//项目名称
private String platformIds;//平台件数据id
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+10
View File
@@ -12191,9 +12191,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = lawsInventoryPlatformEOService.list(wrapper);
List<String> idList = new ArrayList<>();
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOS)){
idList = lawsInventoryPlatformEOS.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
projectLawsInventoryEOList = this.listByIds(idList);
if(ObjectUtils.isNotEmpty(projectLawsInventoryEOList)){
List<String> projectIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).collect(Collectors.toList());
projectLibraryBaseList = projectLibraryBaseService.listByIds(projectIdList);
}
List<String> userIdList = new ArrayList<>();
List<String> collect1 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList());
List<String> collect2 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList());
@@ -12228,6 +12233,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) {
List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
.filter(e -> e.getId().equals(projectLawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList());
if(ObjectUtils.isNotEmpty(libraryBaseList)){
projectLawsInventoryEO.setProjectName(libraryBaseList.get(0).getProjectNameId());
}
//流程状态
String flowStatus = "";
if(FlowFlagEnum.DESIGN.getValue().equals(flowFlag)){//流程标识，点击设计符合性流程状态跳转