diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java index 1541fdb55..cb51993af 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java @@ -51,8 +51,8 @@ public class LineInterviewPageVO { @ApiModelProperty("招商经理") private String investmentManagerUsername; - @ApiModelProperty("线索来源") - private Integer lineSource; + @ApiModelProperty("线索来源名称") + private String lineSourceName; @ApiModelProperty("实际开始时间") private String actualStartTime; @@ -66,7 +66,7 @@ public class LineInterviewPageVO { @ApiModelProperty("房间id") private String roomId; - public static List convertList(List list, Map userPortraitMap, Map userNameMap, Map cityNameMap){ + public static List convertList(List list, Map userPortraitMap, Map userNameMap, Map cityNameMap, Map channelMap){ if(CollectionUtils.isEmpty(list)){ return Lists.newArrayList(); } @@ -82,7 +82,7 @@ public class LineInterviewPageVO { result.setEndTime(lineInterviewPage.getEndTime()); result.setInterviewStatus(lineInterviewPage.getInterviewStatus()); result.setInvestmentManagerUsername(userNameMap.get(lineInterviewPage.getInvestmentManager())); - result.setLineSource(lineInterviewPage.getLineSource()); + result.setLineSourceName(channelMap.get(lineInterviewPage.getLineSource())); result.setActualStartTime(lineInterviewPage.getActualStartTime()); result.setActualEndTime(lineInterviewPage.getActualEndTime()); result.setInterviewerUsername(userNameMap.get(lineInterviewPage.getInterviewerUserId())); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java index b5ee24b68..da88d8214 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java @@ -69,6 +69,8 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt private SysRoleService sysRoleService; @Resource private TransferLogService transferLogService; + @Resource + private HyPartnerUserChannelDAO hyPartnerUserChannelDAO; @Override public List getAppointmentTime(Long lineId, Integer interviewType, LocalDate appointmentDate) { @@ -244,11 +246,13 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt List investmentManagerUserIds = pageInfo.stream().filter(x -> StringUtils.isNotEmpty(x.getInvestmentManager() )).map(LineInterviewPageDTO::getInvestmentManager).collect(Collectors.toList()); List interviewerUserIds = pageInfo.stream().filter(x -> StringUtils.isNotEmpty(x.getInterviewerUserId() )).map(LineInterviewPageDTO::getInterviewerUserId).collect(Collectors.toList()); List wantShopAreaIds = pageInfo.stream().filter(x -> Objects.nonNull(x.getWantShopAreaId() )).map(LineInterviewPageDTO::getWantShopAreaId).collect(Collectors.toList()); + List lineSourceIds = pageInfo.stream().filter(lineInfoDO -> lineInfoDO.getLineSource() != null).map(LineInterviewPageDTO::getLineSource).collect(Collectors.toList()); Map cityNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds); List userIds = Stream.concat(investmentManagerUserIds.stream(), interviewerUserIds.stream()).distinct().collect(Collectors.toList()); Map userNameMap = enterpriseUserDAO.getUserNameMap(userIds); Map userPortraitMap = labelService.getUserPortraitMap(userPortraitList); - List resultList = LineInterviewPageVO.convertList(pageInfo, userPortraitMap, userNameMap, cityNameMap); + Map channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(lineSourceIds); + List resultList = LineInterviewPageVO.convertList(pageInfo, userPortraitMap, userNameMap, cityNameMap, channelMap); PageInfo resultPage = new PageInfo(pageInfo); resultPage.setList(resultList); return resultPage;