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 15:53:41 +08:00
parent 49c675e1ee 5892bbc79f
commit c36b76bec3
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+1 -1
View File
@@ -1832,7 +1832,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
public List<Map<String, Object>> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut, List<ProjectLibraryBase> plbEoList) { public List<Map<String, Object>> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut, List<ProjectLibraryBase> plbEoList) {
List<Map<String, Object>> result = new ArrayList<>(); List<Map<String, Object>> result = new ArrayList<>();
List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>(); List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
if (!plbEoList.isEmpty()) { if (ObjectUtils.isNotEmpty(plbEoList)) {
projectLibraryBaseList = plbEoList.stream().filter(e -> e.getId().equals(projectId)).collect(Collectors.toList()); projectLibraryBaseList = plbEoList.stream().filter(e -> e.getId().equals(projectId)).collect(Collectors.toList());
} }
List<OtaManageApplyEO> receiveList = this.getBaseMapper().getListByProjectId(projectId, plannedBpLaunchBatch); List<OtaManageApplyEO> receiveList = this.getBaseMapper().getListByProjectId(projectId, plannedBpLaunchBatch);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+10 -10
View File
@@ -3955,16 +3955,16 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
} }
queryWrapper.orderByDesc("create_time", "serial_number"); queryWrapper.orderByDesc("create_time", "serial_number");
int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode()); // int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
if (isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()) // if (isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue()) // && isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())) { // && isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())) {
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
queryWrapper.and(q -> { // queryWrapper.and(q -> {
q.eq("regulation_owner_id", currentUser.getId()). // q.eq("regulation_owner_id", currentUser.getId()).
or().eq("homologation_engineer_id", currentUser.getId()); // or().eq("homologation_engineer_id", currentUser.getId());
}); // });
} // }
//导出的数据 //导出的数据
dataList = this.list(queryWrapper); dataList = this.list(queryWrapper);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+2 -2
View File
@@ -1286,12 +1286,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
//平台件项目对应的法规清单数据 //平台件项目对应的法规清单数据
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(","))); wrapper1.in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1); List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1);
//平台件项目信息 //平台件项目信息
List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>(); List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
if(!lawsInventoryEOList.isEmpty()){ if(!lawsInventoryEOList.isEmpty() && ObjectUtils.isNotEmpty(lawsInventoryEOS)){
List<String> projectIdList = lawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList()); List<String> projectIdList = lawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
wrapper2.in(ProjectLibraryBase::getId,projectIdList); wrapper2.in(ProjectLibraryBase::getId,projectIdList);