From 834d18015ba80b5ece247ed610a4a9d5947e54b2 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 8 Aug 2024 15:52:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/laws/common/constant/FieldCommon.java | 2 ++ .../laws/common/service/impl/LawsCommonServiceImpl.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index 78ea2b22..6533acd5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -137,6 +137,8 @@ public class FieldCommon { // 字典值统一后缀 public static final String _DICT_TEXT = "_dictText"; + // 字典值统一英文后缀 + public static final String _DICT_TEXT_EN = "_dictTextEn"; // 标准拆分单后缀 public static final String _STANDARD_SPLIT = "_standardSplit"; // 管理员 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 52cda0f1..b1f06028 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -667,6 +667,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService { && valueList.contains(dictItem.getItemValue())) .map(SysDictItem::getItemText).collect(Collectors.toList()); resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(nameList, ",")); + List enNameList = dictItemList.stream().filter(dictItem -> + lawsTag.getDictId().equals(dictItem.getDictId()) + && valueList.contains(dictItem.getItemValue())) + .map(SysDictItem::getEnName).collect(Collectors.toList()); + resultMap.put(key + FieldCommon._DICT_TEXT_EN, StringUtils.join(enNameList, ",")); } } }