From 625e336371861526116026c1f882299a52aa2fa8 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 17 Aug 2023 18:46:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/common/helper/RegionCacheHelper.java | 4 +- .../common/helper/impl/RegionsCacheHelperImpl.java | 11 +++--- .../expert/assembler/ExpertUserInfoAssembler.java | 44 +++++++++++----------- .../pmapi/expert/manage/ExpertManage.java | 2 +- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/RegionCacheHelper.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/RegionCacheHelper.java index f17195f..f9ee333 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/RegionCacheHelper.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/RegionCacheHelper.java @@ -105,8 +105,8 @@ public interface RegionCacheHelper { * * @param code 区域编码 * @param level 区域层级 - * @return + * @return \ */ - String getUnionPathStr(String code, Integer level); + String getUnionPath(String code, Integer level); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionsCacheHelperImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionsCacheHelperImpl.java index dd852d0..4bc4194 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionsCacheHelperImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionsCacheHelperImpl.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.common.helper.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.StrPool; import com.ningdatech.basic.exception.BizException; import com.ningdatech.basic.util.CollUtils; @@ -197,15 +198,15 @@ public class RegionsCacheHelperImpl extends AbstractRegionCacheHelper implements @Override - public String getUnionPathStr(String code, Integer level) { - if (StringUtils.isBlank(code) || Objects.isNull(level)) { - return null; + public String getUnionPath(String code, Integer level) { + if (StrUtils.isBlank(code) || Objects.isNull(level)) { + return StrUtils.EMPTY; } List unionPathStrList = new ArrayList<>(); buildUnionPathStrList(code, level, unionPathStrList); Collections.reverse(unionPathStrList); - if (CollectionUtils.isEmpty(unionPathStrList)) { - return null; + if (CollUtil.isEmpty(unionPathStrList)) { + return StrUtils.EMPTY; } return String.join("@@", unionPathStrList); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java index c6f6ccb..5541f7a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java @@ -44,43 +44,43 @@ public class ExpertUserInfoAssembler { private final DictionaryCache dictionaryCache; private final RegionCacheHelper regionCacheHelper; - public ExpertFullInfoVO buildExpertFullInfoVO(List attachFiles, ExpertFullInfoAllDTO expertFullInfoAll) { + public ExpertFullInfoVO buildExpertFullInfo(List attachFiles, ExpertFullInfoAllDTO expertFullInfoAll) { ExpertUserFullInfoDTO expertUserInfo = expertFullInfoAll.getExpertUserInfoDTO(); // 字典字典段map - Map> dictInfoMap = buildDictInfoMap(expertFullInfoAll.getExpertDictionaryList()); + Map> dictMap = buildDictInfoMap(expertFullInfoAll.getExpertDictionaryList()); // 专家文件资料map - Map fileInfoMap = buildFileBasicInfoMap(attachFiles); + Map fileMap = buildFileBasicInfoMap(attachFiles); // 专家标签字段map - Map> tagInfoMap = buildTagFieldInfoMap(expertFullInfoAll.getExpertTagList()); + Map> tagMap = buildTagFieldInfoMap(expertFullInfoAll.getExpertTagList()); // 专家履职意向地 - List intentionWorkRegion = expertFullInfoAll.getExpertIntentionWorkRegionInfo(); + List intentionWorkRegions = expertFullInfoAll.getExpertIntentionWorkRegionInfo(); // 专家回避单位列表 - List expertAvoidCompanyList = expertFullInfoAll.getExpertAvoidCompanyList(); + List avoidCompanies = expertFullInfoAll.getExpertAvoidCompanyList(); // 基本信息 - ExpertBasicInfo basicInfo = buildExpertBasicInfo(expertUserInfo, dictInfoMap, tagInfoMap, intentionWorkRegion, fileInfoMap); + ExpertBasicInfo basicInfo = buildExpertBasicInfo(expertUserInfo, dictMap, tagMap, intentionWorkRegions, fileMap); // 学历信息 - ExpertEduInfo eduInfo = buildExpertEduInfo(expertUserInfo, dictInfoMap, fileInfoMap); + ExpertEduInfo eduInfo = buildExpertEduInfo(expertUserInfo, dictMap, fileMap); // 职业信息 - ExpertJobInfo jobInfo = buildExpertJobInfo(expertUserInfo, dictInfoMap); + ExpertJobInfo jobInfo = buildExpertJobInfo(expertUserInfo, dictMap); + jobInfo.setBusinessStrips(expertFullInfoAll.getBusinessStrips()); // 专业信息 - ExpertProfessionalInfo professionalInfo = buildExpertProfessionalInfo(expertUserInfo, dictInfoMap - , tagInfoMap, fileInfoMap, expertAvoidCompanyList); + ExpertProfessionalInfo profession = buildExpertProfessionalInfo(expertUserInfo, dictMap, tagMap, fileMap, avoidCompanies); // 推荐信息 ExpertRecommendInfo recommendInfo = new ExpertRecommendInfo(); - recommendInfo.setRecommendedWay(dictInfoMap.get(DictExpertInfoTypeEnum.RECOMMENDED_WAY.getKey())); - recommendInfo.setRecommendationProofFile(getFileBasicInfoList(fileInfoMap, expertUserInfo.getRecommendationProofFileIdList())); + recommendInfo.setRecommendedWay(dictMap.get(DictExpertInfoTypeEnum.RECOMMENDED_WAY.getKey())); + recommendInfo.setRecommendationProofFile(getFileBasicInfoList(fileMap, expertUserInfo.getRecommendationProofFileIdList())); // 其他信息 ExpertOtherInfo otherInfo = new ExpertOtherInfo(); - otherInfo.setOther(tagInfoMap.get(ExpertTagEnum.OTHER.getKey())); + otherInfo.setOther(tagMap.get(ExpertTagEnum.OTHER.getKey())); otherInfo.setRemark(expertUserInfo.getRemark()); // 专家申请履职意向展示列表 List applyIntentionWorkRegions = expertFullInfoAll.getExpertApplyIntentionWorkRegionInfo().stream().map(r -> { - ExpertRegionInfo expertApplyIntentionWorkRegion = new ExpertRegionInfo(); - expertApplyIntentionWorkRegion.setRegionLevel(r.getRegionLevel()); - expertApplyIntentionWorkRegion.setRegionCode(r.getRegionCode()); - expertApplyIntentionWorkRegion.setRegionName(regionCacheHelper.getUnionPathStr(r.getRegionCode(), r.getRegionLevel())); - return expertApplyIntentionWorkRegion; + ExpertRegionInfo intentionWorkRegion = new ExpertRegionInfo(); + intentionWorkRegion.setRegionLevel(r.getRegionLevel()); + intentionWorkRegion.setRegionCode(r.getRegionCode()); + intentionWorkRegion.setRegionName(regionCacheHelper.getUnionPath(r.getRegionCode(), r.getRegionLevel())); + return intentionWorkRegion; }).collect(Collectors.toList()); if (CollUtil.isEmpty(basicInfo.getExpertIntentionWorkRegions())) { @@ -91,7 +91,7 @@ public class ExpertUserInfoAssembler { resExpertFullInfo.setBasicInfo(basicInfo); resExpertFullInfo.setEduInfo(eduInfo); resExpertFullInfo.setJobInfo(jobInfo); - resExpertFullInfo.setProfessionalInfo(professionalInfo); + resExpertFullInfo.setProfessionalInfo(profession); resExpertFullInfo.setRecommendInfo(recommendInfo); resExpertFullInfo.setExpertOtherInfo(otherInfo); resExpertFullInfo.setExpertApplyIntentionWorkRegions(applyIntentionWorkRegions); @@ -236,14 +236,14 @@ public class ExpertUserInfoAssembler { basicInfo.setHometown(expertUserInfoDTO.getHometown()); basicInfo.setNationality(expertUserInfoDTO.getNationality()); basicInfo.setExpertSource(tagFieldInfoMap.get(ExpertTagEnum.EXPERT_SOURCE.getKey())); - expertRegionInfo.setRegionName(regionCacheHelper.getUnionPathStr(expertRegionInfo.getRegionCode(), expertRegionInfo.getRegionLevel())); + expertRegionInfo.setRegionName(regionCacheHelper.getUnionPath(expertRegionInfo.getRegionCode(), expertRegionInfo.getRegionLevel())); basicInfo.setExpertRegionInfo(expertRegionInfo); basicInfo.setExpertIntentionWorkRegions(expertIntentionWorkRegionInfo.stream().map(r -> { ExpertRegionInfo expertIntentionWorkRegion = new ExpertRegionInfo(); expertIntentionWorkRegion.setRegionCode(r.getRegionCode()); expertIntentionWorkRegion.setRegionLevel(r.getRegionLevel()); - expertIntentionWorkRegion.setRegionName(regionCacheHelper.getUnionPathStr(r.getRegionCode(), r.getRegionLevel())); + expertIntentionWorkRegion.setRegionName(regionCacheHelper.getUnionPath(r.getRegionCode(), r.getRegionLevel())); return expertIntentionWorkRegion; }).collect(Collectors.toList())); basicInfo.setExpertType(dictionaryFieldInfoMap.get(DictExpertInfoTypeEnum.EXPERT_TYPE.getKey())); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java index ba9fee0..e209a6d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java @@ -135,7 +135,7 @@ public class ExpertManage { } List fileIdList = expertInfoCommonHelper.getExpertFileIdList(expertUserFullInfoAll); List attachFiles = fileService.getByIds(fileIdList); - return expertUserInfoAssembler.buildExpertFullInfoVO(attachFiles, expertUserFullInfoAll); + return expertUserInfoAssembler.buildExpertFullInfo(attachFiles, expertUserFullInfoAll); } @Transactional(rollbackFor = Exception.class) From 97b5268219d6e4eaa134dc0e09c4d5a59854c435 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 18 Aug 2023 09:44:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=9E=E9=81=BF=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=9E=E9=81=BF=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ningdatech/pmapi/meeting/entity/vo/AvoidInfoVO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/AvoidInfoVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/AvoidInfoVO.java index 7dfa8cb..171a3fe 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/AvoidInfoVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/AvoidInfoVO.java @@ -18,6 +18,9 @@ import java.util.List; @ApiModel("回避信息") public class AvoidInfoVO { + @ApiModelProperty("回避类型：1 回避同单位、2 回避同条线、3 不回避") + private Integer avoidType; + @ApiModelProperty("回避单位") private List avoidUnitIds;