车型库详情页-问题管理
This commit is contained in:
+9
@@ -10979,9 +10979,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private List<Map<String, Object>> getNewData(Map<String, Object> params, String cut,boolean administrator) {
|
private List<Map<String, Object>> getNewData(Map<String, Object> params, String cut,boolean administrator) {
|
||||||
|
|
||||||
|
// params.put("numberPlatform","NT2");
|
||||||
|
// params.put("carPlatform","NT2");
|
||||||
|
|
||||||
//新数据
|
//新数据
|
||||||
LambdaQueryWrapper<ProblemManagementEO> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ProblemManagementEO> wrapper = new LambdaQueryWrapper<>();
|
||||||
wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId"));
|
wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId"));
|
||||||
|
wrapper.or().eq(ProblemManagementEO::getProjectId,params.get("numberPlatform"));
|
||||||
|
wrapper.or().eq(ProblemManagementEO::getProjectId, params.get("carPlatform"));
|
||||||
List<ProblemManagementEO> managementEOList = problemManagementEOService.list(wrapper);
|
List<ProblemManagementEO> managementEOList = problemManagementEOService.list(wrapper);
|
||||||
//法规
|
//法规
|
||||||
List<String> lawsIdList = managementEOList.stream()
|
List<String> lawsIdList = managementEOList.stream()
|
||||||
@@ -11078,6 +11084,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
List<ProjectLibraryBase> projectLibraryBaseListTemp = projectLibraryBaseList.stream()
|
List<ProjectLibraryBase> projectLibraryBaseListTemp = projectLibraryBaseList.stream()
|
||||||
.filter(e->StringUtils.isNotBlank(problemManagementEO.getProjectId())
|
.filter(e->StringUtils.isNotBlank(problemManagementEO.getProjectId())
|
||||||
&& problemManagementEO.getProjectId().contains(e.getId())).collect(Collectors.toList());
|
&& problemManagementEO.getProjectId().contains(e.getId())).collect(Collectors.toList());
|
||||||
|
if(ObjectUtils.isEmpty(projectLibraryBaseListTemp)){
|
||||||
|
map.put("projectName",problemManagementEO.getProjectId());
|
||||||
|
}
|
||||||
//目标市场数据字典
|
//目标市场数据字典
|
||||||
List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
|
List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
|
||||||
List<String> projectNameList = new ArrayList<>();
|
List<String> projectNameList = new ArrayList<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user