|
|
@ -1069,6 +1069,9 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
List<ConductRecord> conductRecords = conductRecordRepository.findByClueIdInOrderByCreateTimeDesc(clueIdList);
|
|
|
|
List<ConductRecord> conductRecords = conductRecordRepository.findByClueIdInOrderByCreateTimeDesc(clueIdList);
|
|
|
|
Map<Long, List<ConductRecord>> map = conductRecords.stream().collect(Collectors.groupingBy(ConductRecord::getClueId));
|
|
|
|
Map<Long, List<ConductRecord>> map = conductRecords.stream().collect(Collectors.groupingBy(ConductRecord::getClueId));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<Long> collect = clueList.stream().filter(clueDto -> Arrays.asList(ClueTypeConstants.CRM_TOKER).contains(clueDto.getClueType())).map(ClueDto::getId).collect(Collectors.toList());
|
|
|
|
|
|
|
|
Map<Long, Long> originByTalkClue = getOriginByTalkClue(collect);
|
|
|
|
|
|
|
|
|
|
|
|
for (ClueDto clue : clueList) {
|
|
|
|
for (ClueDto clue : clueList) {
|
|
|
|
//获取缓存中任务名称
|
|
|
|
//获取缓存中任务名称
|
|
|
|
clue.setTaskName(findTaskName(clue.getTaskId()));
|
|
|
|
clue.setTaskName(findTaskName(clue.getTaskId()));
|
|
|
@ -1082,10 +1085,24 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
List<ConductRecord> recordList = map.get(clue.getId());
|
|
|
|
List<ConductRecord> recordList = map.get(clue.getId());
|
|
|
|
clue.setClueRecord(recordList.get(0).getRecordInfo());
|
|
|
|
clue.setClueRecord(recordList.get(0).getRecordInfo());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Arrays.asList(ClueTypeConstants.CRM_TOKER).contains(clue.getClueType())) {
|
|
|
|
|
|
|
|
clue.setOriginTaskName(findTaskName(originByTalkClue.get(clue.getId())));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return PageUtil.toPage(clueList, count);
|
|
|
|
return PageUtil.toPage(clueList, count);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Map<Long, Long> getOriginByTalkClue(List<Long> clueIds) {
|
|
|
|
|
|
|
|
List<ClueTalk> clueTalks = clueTalkRepository.queryTaskIdByClueId(clueIds);
|
|
|
|
|
|
|
|
Map<Long, Long> taskIdByClueId = new HashMap<>();
|
|
|
|
|
|
|
|
clueTalks.forEach(clueTalk -> {
|
|
|
|
|
|
|
|
if (!taskIdByClueId.containsKey(clueTalk.getClueId())) {
|
|
|
|
|
|
|
|
taskIdByClueId.put(clueTalk.getClueId(), clueTalk.getTaskId());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
return taskIdByClueId;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 获取任务id集合
|
|
|
|
* 获取任务id集合
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|