From dd58c342905f1e3aa75d0dd211311b3d8ed9b79f Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 18:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE-=E6=9C=AA=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/enums/DicCodeEnum.java | 1 + .../xml/ProjectLawsInventoryEOMapper.xml | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 66 +++++++++++++++++-- 3 files changed, 61 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java index c1f571268..313ad591e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java @@ -6,6 +6,7 @@ package com.jero.modules.system.enums; public enum DicCodeEnum { REGION("适用地区","1493782108399820801","region"), DUTY_TERRITORY("责任领域","1513417672023441409","duty_territory"), + PROBLEM_TYPE("问题类型","1697066042058821634","wen4_ti2_lei4_xing2"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml index 6d2dc3451..b24afb028 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml @@ -158,7 +158,7 @@ #{item} ) temp - + order by temp.${params.orderByField} 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 6c00a1e74..140906d37 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 @@ -10321,6 +10321,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> mapList = getNewData(params, cut); + if(ObjectUtils.isNotEmpty(mapList)){ + result.addAll(mapList); + } + return result; + } + + @NotNull + private List> getNewData(Map params, String cut) { //新数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId")); List managementEOList = problemManagementEOService.list(wrapper); //法规 List lawsIdList = managementEOList.stream() - .filter(e->StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList()); + .filter(e-> StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList()); //项目 List projectIdList = managementEOList.stream() .filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList()); @@ -10449,6 +10462,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl problemTypeList = sysDictService.queryDictItemsByCode(DicCodeEnum.PROBLEM_TYPE.getCode()); + List ncrTrackVOList = new ArrayList<>(); List> mapList = new ArrayList<>(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -10464,7 +10479,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dictModelList = problemTypeList.stream().filter(e -> e.getValue().equals(problemManagementEO.getProblemType())).collect(Collectors.toList()); + + if(!dictModelList.isEmpty()){ + if(CutEnum.CN.getValue().equals(cut)){ + map.put("problemType_dictText",dictModelList.get(0).getText()); + }else{ + map.put("problemType_dictText",dictModelList.get(0).getTextEn()); + } + } //相关法规 if(StringUtils.isNotBlank(problemManagementEO.getLawsId())){ if(!documentLibraryEOList.isEmpty()){ @@ -10558,8 +10585,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> dataParameter(Map params, List> mapList) { + if(ObjectUtils.isNotEmpty(params.get("title"))){//标题 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("title")) + && e.get("title").toString().contains(params.get("title").toString())).collect(Collectors.toList()); } - return result; + if(ObjectUtils.isNotEmpty(params.get("lawsName"))){//相关法规 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("lawsName")) + && e.get("lawsName").toString().contains(params.get("lawsName").toString())).collect(Collectors.toList()); + } + if(ObjectUtils.isNotEmpty(params.get("projectId"))){//相关项目 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("projectId")) + && String.valueOf(e.get("projectId")).equals(String.valueOf(params.get("projectId")))).collect(Collectors.toList()); + } + if(ObjectUtils.isNotEmpty(params.get("problemType"))){//问题类型 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("problemType")) + && e.get("problemType").toString().equals(params.get("problemType").toString())).collect(Collectors.toList()); + } + if(ObjectUtils.isNotEmpty(params.get("dutyTerritory"))){//责任领域 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("dutyTerritory")) + && e.get("dutyTerritory").toString().contains(params.get("dutyTerritory").toString())).collect(Collectors.toList()); + } + if(ObjectUtils.isNotEmpty(params.get("problemState"))){//问题状态 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("problemState")) + && e.get("problemState").toString().contains(params.get("problemState").toString())).collect(Collectors.toList()); + } + return mapList; } @Override