From 221f480cd2ae7459b92356e0ff9bf336b6e9297a Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Thu, 7 Dec 2023 16:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E6=B5=B7=E8=BF=94=E5=9B=9E=E7=BA=BF?= =?UTF-8?q?=E7=B4=A2=E5=8F=82=E5=8A=A0=E4=BC=9A=E9=94=80=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dao/HyPartnerExhibitionDAO.java | 7 ++++++ .../mapper/HyPartnerExhibitionMapper.java | 7 ++++++ .../mapper/HyPartnerExhibitionMapper.xml | 22 +++++++++++++++++++ .../mapper/HyPartnerLineInfoMapper.xml | 1 + .../store/dto/partner/PrivateSeaLineDTO.java | 3 +++ .../request/PrivateSeaLineListRequest.java | 3 +++ .../cool/store/vo/PrivateSeaLineListVo.java | 18 ++++++++++++++- .../impl/HyPartnerLineInfoServiceImpl.java | 4 +++- 8 files changed, 63 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java index d9c7b62d4..621a347fd 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java @@ -98,4 +98,11 @@ public class HyPartnerExhibitionDAO { } return hyPartnerExhibitionMapper.queryListByInterviewPlanIds(interviewPlanIds); } + + public List queryListByLineIds(List lindIds) { + if (ObjectUtils.isEmpty(lindIds)) { + return new ArrayList<>(); + } + return hyPartnerExhibitionMapper.queryListByLineIds(lindIds); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java index 08a5b9447..e09751199 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java @@ -70,4 +70,11 @@ public interface HyPartnerExhibitionMapper { * @return */ List queryListByInterviewPlanIds(@Param("interviewPlanIds") List interviewPlanIds); + + /** + * 查询处在会销面试状态中的线索ids + * @param lindIds + * @return + */ + List queryListByLineIds(@Param("lineIds") List lindIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml index e7e4077f8..39f8527e3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml @@ -315,4 +315,26 @@ ) + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 2f2d67dd1..74c406636 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -545,6 +545,7 @@ hpli.investment_manager as investmentManager, hpli.development_manager as developmentManager, hpli.line_status as lineStatus, + hpli.whether_in_exhibition as whetherInExhibition, hpli.update_time as updateTime, hpuinfo.user_channel_id as userChannelId, hpuinfo.want_shop_area as wantShopArea, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java index 7f1797d8a..295a40fee 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java @@ -63,6 +63,9 @@ public class PrivateSeaLineDTO { @ApiModelProperty("线索状态") private Integer lineStatus; + @ApiModelProperty("是否在会销中") + private Boolean whetherInExhibition; + @ApiModelProperty("推荐加盟商ID") private String recommendPartnerId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java index 64490145c..e335ad6f9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java @@ -83,6 +83,9 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { @ApiModelProperty("线索id") private Long lineId; + @ApiModelProperty("是否会销中") + private Boolean whetherInExhibition; + /** * deadline 截至时间 * updateTime 更新时间 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java index 043c09f4b..bcd842998 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; @@ -84,6 +85,12 @@ public class PrivateSeaLineListVo { @ApiModelProperty("线索状态") private Integer lineStatus; + @ApiModelProperty("是否在会销中") + private Boolean whetherInExhibition; + + @ApiModelProperty("是否处于会销面试中") + private Boolean whetherExhibitionInterview; + @ApiModelProperty("推荐加盟商ID") private String recommendPartnerId; @@ -108,12 +115,14 @@ public class PrivateSeaLineListVo { public static List convertList(List list, Map finalDevManagerMap, Map wantShopAreaNameMap, - Map hyPartnerInterviewPlanDOMap,Map channelMap,Map userPortraitMap){ + Map hyPartnerInterviewPlanDOMap,Map channelMap,Map userPortraitMap, + List exhibitionInterviewLines){ List resultList = new ArrayList<>(); for (PrivateSeaLineDTO x : list) { PrivateSeaLineListVo privateSeaLineListVo = new PrivateSeaLineListVo(); privateSeaLineListVo.setLineId(x.getLineId()); privateSeaLineListVo.setLineStatus(x.getLineStatus()); + privateSeaLineListVo.setWhetherInExhibition(x.getWhetherInExhibition()); privateSeaLineListVo.setPartnerId(x.getPartnerId()); privateSeaLineListVo.setWorkflowStatus(x.getWorkflowStatus()); String deadLine = DateUtil.format(x.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_2); @@ -161,6 +170,13 @@ public class PrivateSeaLineListVo { } } } + //在会销面试中的线索 + privateSeaLineListVo.setWhetherExhibitionInterview(Boolean.FALSE); + if (privateSeaLineListVo.getWhetherInExhibition() + && ObjectUtils.isNotEmpty(exhibitionInterviewLines) + && exhibitionInterviewLines.contains(x.getLineId())) { + privateSeaLineListVo.setWhetherExhibitionInterview(Boolean.TRUE); + } privateSeaLineListVo.setUserPortraitList(userPortraitList); resultList.add(privateSeaLineListVo); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 9ed44b36d..0f0f049ba 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -668,6 +668,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { return privateLineList; } List lindIds = list.stream().map(PrivateSeaLineDTO::getLineId).collect(Collectors.toList()); + //查询处在会销面试中的线索 + List exhibitionInterviewLines = partnerExhibitionDAO.queryListByLineIds(lindIds); List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanDAO.getHyPartnerInterviewPlanByLineIds(lindIds); Map hyPartnerInterviewPlanDOMap = hyPartnerInterviewPlanDOS.stream().collect(Collectors.toMap(HyPartnerInterviewPlanDO::getPartnerLineId, data -> data)); @@ -686,7 +688,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { List userPortraitList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait())).map(PrivateSeaLineDTO::getUserPortrait).collect(Collectors.toList()); Map userPortraitMap = labelService.getUserPortraitMap(userPortraitList); - List result = PrivateSeaLineListVo.convertList(list, devManagerMap, wantShopAreaNameMap, hyPartnerInterviewPlanDOMap, channelMap, userPortraitMap); + List result = PrivateSeaLineListVo.convertList(list, devManagerMap, wantShopAreaNameMap, hyPartnerInterviewPlanDOMap, channelMap, userPortraitMap, exhibitionInterviewLines); privateLineList.setList(result); return privateLineList; }