From ebea60e23adbcd30ba44ac24bb5d013840fd87a7 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 18 Oct 2023 11:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=EF=BC=88=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/util/DictItemUtil.java | 43 +++++++++++++++++++ .../ProjectLawsInventoryEOServiceImpl.java | 7 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/DictItemUtil.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/DictItemUtil.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/DictItemUtil.java new file mode 100644 index 000000000..f8f599022 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/DictItemUtil.java @@ -0,0 +1,43 @@ +package com.jero.modules.system.util; + +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.vo.DictModel; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @description + * @date 2023/10/18 10:59 + * @auth zhn + */ +public class DictItemUtil { + public static String getDictItemText(String cut, String value, List dictModelAll) { + if (StringUtils.isBlank(value)) { + return ""; + } + List dictModelList = new ArrayList<>(); + for (String s : value.split(",")) { + List dictModelListTemp = dictModelAll.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + String targetMarket = ""; + if (dictModelList.size() != 0) { + StringBuilder sb = new StringBuilder(); + for (DictModel dictModel : dictModelList) { + if (CutEnum.CN.getValue().equals(cut)) { + sb.append(dictModel.getText() + ","); + } else { + sb.append(dictModel.getTextEn() + ","); + } + } + if (com.jero.modules.system.util.StringUtils.isNotBlank(sb)) { + targetMarket = sb.substring(0, sb.length() - 1); + } + } + return targetMarket; + } +} 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 1c1c5d16e..71b59f1d9 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 @@ -129,6 +129,7 @@ import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import com.jero.modules.system.util.DictItemUtil; import com.jero.modules.system.util.PDFUtils; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; @@ -12391,6 +12392,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); if(!projectLawsInventoryEOList.isEmpty()){ List projectLibraryIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -12402,7 +12404,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = libraryBaseList.stream().filter(e -> inventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList()); if(!collect.isEmpty()){ - inventoryEO.setProjectName(collect.get(0).getProjectNameId()); + //目标市场 + String targetMarket = DictItemUtil.getDictItemText(cut,collect.get(0).getTargetMarket(),targetMarketList); + String projectName = collect.get(0).getPower()+collect.get(0).getProducer() + targetMarket; + inventoryEO.setProjectName(projectName); } } }