From 2701fbdd31bf5f023eccd89d28ed9b2018d62c38 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 5 Jul 2022 09:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?= =?UTF-8?q?=E6=94=B6=E9=9B=86-bug55428?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 6 ++-- .../IParamsCollectManifestEOService.java | 2 +- .../ParamsCollectManifestEOServiceImpl.java | 34 +++++++++++++++++-- ...msCollectManifestHistoryEOServiceImpl.java | 8 ++++- .../impl/ParamsReportDetailEOServiceImpl.java | 8 ++++- 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 1b3a080a4..aed81c064 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -140,7 +140,7 @@ public class ParamsCollectManifestEOController extends JeroController> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO, + public Result>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO, @RequestParam(name = "cut") String cut) { if (StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber())) { paramsCollectManifestVO.setNioNumber(paramsCollectManifestVO.getNioNumber().replace("%","\\%")); @@ -149,8 +149,8 @@ public class ParamsCollectManifestEOController extends JeroController list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO); - return Result.OK(cut, list); + List> list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO); + return Result.OK(list); } /** diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 977b46f42..fce085305 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -95,7 +95,7 @@ public interface IParamsCollectManifestEOService extends IService getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO); + List> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO); List> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 71ccbffc7..91c88c0de 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -841,7 +841,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) { + public List> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) { + String cut = paramsCollectManifestVO.getCut(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsInfoPublishEO::getParamsTemplateId, paramsCollectManifestVO.getParamsTemplateId()) .eq(ParamsInfoPublishEO::getVersion, paramsCollectManifestVO.getParamsTemplatePublishVersion()) @@ -859,7 +861,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); paramsInfoPublishEOList = paramsInfoPublishEOList.stream().filter(e-> !nioNumberList.contains(e.getNioNumber())).collect(Collectors.toList()); - return paramsInfoPublishEOList; + // 查询 责任领域 数据字典 + List dictItems = sysDictItemService.selectItemsByDictCode("duty_territory"); + Map dictItemsMap = new HashMap<>(); + if (CutEnum.EN.getValue().equals(cut)) { + dictItemsMap = dictItems.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); + } else { + dictItemsMap = dictItems.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); + } + + // 处理数据 返回map ---> 解决数据量大,系统拦截器转换数据字典慢的问题 + List> listMapForAdd = new ArrayList<>(); + Map finalDictItemsMap = dictItemsMap; + paramsInfoPublishEOList.forEach(paramsInfoPublishEO -> { + Map paramsInfoPublishMap = objectToMap(paramsInfoPublishEO); + // 处理责任领域数据字典 + paramsInfoPublishMap.put("dutyTerritory_dictText", finalDictItemsMap.get(paramsInfoPublishEO.getDutyTerritory())); + + listMapForAdd.add(paramsInfoPublishMap); + }); + + return listMapForAdd; } @Override @@ -1664,7 +1686,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl