suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-10 14:54:08 +08:00
parent aed9273e58
commit 4d1b7ef6ff
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java
View File

@@ -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<LineInterviewPageVO> convertList(List<LineInterviewPageDTO> list, Map<Long, String> userPortraitMap, Map<String, String> userNameMap, Map<Long, String> cityNameMap){
public static List<LineInterviewPageVO> convertList(List<LineInterviewPageDTO> list, Map<Long, String> userPortraitMap, Map<String, String> userNameMap, Map<Long, String> cityNameMap, Map<Integer, String> 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()));

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
View File

@@ -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<AppointmentTimeVO> getAppointmentTime(Long lineId, Integer interviewType, LocalDate appointmentDate) {
@@ -244,11 +246,13 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
List<String> investmentManagerUserIds = pageInfo.stream().filter(x -> StringUtils.isNotEmpty(x.getInvestmentManager() )).map(LineInterviewPageDTO::getInvestmentManager).collect(Collectors.toList());
List<String> interviewerUserIds = pageInfo.stream().filter(x -> StringUtils.isNotEmpty(x.getInterviewerUserId() )).map(LineInterviewPageDTO::getInterviewerUserId).collect(Collectors.toList());
List<Long> wantShopAreaIds = pageInfo.stream().filter(x -> Objects.nonNull(x.getWantShopAreaId() )).map(LineInterviewPageDTO::getWantShopAreaId).collect(Collectors.toList());
List<Integer> lineSourceIds = pageInfo.stream().filter(lineInfoDO -> lineInfoDO.getLineSource() != null).map(LineInterviewPageDTO::getLineSource).collect(Collectors.toList());
Map<Long, String> cityNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds);
List<String> userIds = Stream.concat(investmentManagerUserIds.stream(), interviewerUserIds.stream()).distinct().collect(Collectors.toList());
Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(userIds);
Map<Long, String> userPortraitMap = labelService.getUserPortraitMap(userPortraitList);
List<LineInterviewPageVO> resultList = LineInterviewPageVO.convertList(pageInfo, userPortraitMap, userNameMap, cityNameMap);
Map<Integer, String> channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(lineSourceIds);
List<LineInterviewPageVO> resultList = LineInterviewPageVO.convertList(pageInfo, userPortraitMap, userNameMap, cityNameMap, channelMap);
PageInfo resultPage = new PageInfo(pageInfo);
resultPage.setList(resultList);
return resultPage;