From 39c600bbffd015d4dc4de066e9676c3909bebbf8 Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 27 Sep 2023 11:05:27 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=9B=B6=E9=83=A8=E4=BB=B6=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/common/constant/FieldCommon.java | 2 ++ .../laws/common/service/ILawsCommonService.java | 2 -- .../common/service/impl/LawsCommonServiceImpl.java | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) 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 d621f394..cbe83ab3 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 @@ -73,6 +73,8 @@ public class FieldCommon { public static final String STANDARD_SYSTEM = "standard_system"; // 标准类别 public static final String STANDARD_CLASS = "standard_class"; + // 零部件名称 + public static final String PART_NAME = "part_name"; // 代替标准号 public static final String REPLACED_STANDARD = "substitute_standard_number"; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java index af7491e9..f93656de 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java @@ -47,8 +47,6 @@ public interface ILawsCommonService { */ List getExportHeaderWithFile(Map parameterMap); - - /** * @Author: liao * @Date: 2023/8/24 9:09 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 57159293..8025878f 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 @@ -303,7 +303,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 对返回的字段值做处理 processResultFieldValue(key, value, fieldList, resultMap, dictItemList); } - processSpecificFieldValue(resultMap, key, id, standardNumber, fieldList); + processSpecificFieldValue(resultMap, key, value, id, standardNumber, fieldList); } return resultMap; } @@ -313,7 +313,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Date: 2023/9/19 13:43 * @Description: 查询返回特殊值处理 **/ - private void processSpecificFieldValue(Map resultMap, String key, + private void processSpecificFieldValue(Map resultMap, String key, String value, String id, String standardNumber, List fieldList) { List lawsTagList = fieldList.stream().filter(lawsTag -> key.equals(lawsTag.getDbFieldName())).collect(Collectors.toList()); @@ -359,6 +359,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService { resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(fileList.stream() .map(OSSFile::getFileName).collect(Collectors.toList()), ",")); } + } else if (FieldCommon.PART_NAME.equals(key)) { + // 如果是零部件名称（存的是id，数据源为其他系统，目前用字典做代替） + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysDictItem::getId, value); + SysDictItem dictItem = sysDictItemService.getOne(queryWrapper); + resultMap.put(key + FieldCommon._DICT_TEXT, dictItem.getItemText()); } } @@ -388,7 +394,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 对返回的字段值做处理 processResultFieldValue(key, value, fieldList, resultMap, dictItemList); } - processSpecificFieldValue(resultMap, key, id, standardNumber, fieldList); + processSpecificFieldValue(resultMap, key, value, id, standardNumber, fieldList); } resultMapList.add(resultMap); }