From 041b79220fa3cfea51250c033110a4eaa5f3d3c9 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 24 Oct 2023 17:39:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5-=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index d7b94aa97..f2f5d9c30 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -10979,9 +10979,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getNewData(Map params, String cut,boolean administrator) { + +// params.put("numberPlatform","NT2"); +// params.put("carPlatform","NT2"); + //新数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId")); + wrapper.or().eq(ProblemManagementEO::getProjectId,params.get("numberPlatform")); + wrapper.or().eq(ProblemManagementEO::getProjectId, params.get("carPlatform")); List managementEOList = problemManagementEOService.list(wrapper); //法规 List lawsIdList = managementEOList.stream() @@ -11078,6 +11084,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLibraryBaseListTemp = projectLibraryBaseList.stream() .filter(e->StringUtils.isNotBlank(problemManagementEO.getProjectId()) && problemManagementEO.getProjectId().contains(e.getId())).collect(Collectors.toList()); + if(ObjectUtils.isEmpty(projectLibraryBaseListTemp)){ + map.put("projectName",problemManagementEO.getProjectId()); + } //目标市场数据字典 List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); List projectNameList = new ArrayList<>();