|
|
|
@ -155,7 +155,7 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
|
if (clueQueryCriteria.getMemberId() != null) {
|
|
|
|
|
clueMiddleRepository.updateUserIdExceptStatus(clueIdList, userId);
|
|
|
|
|
} else {
|
|
|
|
|
clueMiddleRepository.updateUserId(clueIdList, DefaultNumberConstants.ONE_NUMBER, userId);
|
|
|
|
|
clueMiddleRepository.updateUserId(clueIdList, DefaultNumberConstants.ZERO_NUMBER, userId);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -168,8 +168,12 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public Map<String, Object> queryAll(ClueQueryCriteria clueQueryCriteria, Pageable pageable) {
|
|
|
|
|
String nid = clueQueryCriteria.getNid();
|
|
|
|
|
if (clueQueryCriteria.getMemberId() != null) {
|
|
|
|
|
List<ClueDto> clueDtoList = clueJpa.getClueList(clueQueryCriteria, pageable);
|
|
|
|
|
if (StringUtils.isNotBlank(nid)){ //手机号搜索
|
|
|
|
|
clueDtoList = clueDtoList.stream().filter(ct -> ct.getNid().contains(nid)).collect(Collectors.toList());
|
|
|
|
|
}
|
|
|
|
|
Long count = clueJpa.getCount(clueQueryCriteria);
|
|
|
|
|
//查询线索记录
|
|
|
|
|
Set<Long> clueIdList = clueDtoList.stream().map(ClueDto::getId).collect(Collectors.toSet());
|
|
|
|
@ -300,6 +304,9 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
|
if (clueMiddle.getClueStage() != null) {
|
|
|
|
|
clueMiddleOne.setClueStage(clueMiddle.getClueStage());
|
|
|
|
|
clueMiddleOne.setClueStageTime(DateUtil.date());
|
|
|
|
|
if (clueMiddleOne.getMemberStatus() != DefaultNumberConstants.TWO_NUMBER){
|
|
|
|
|
clueMiddleOne.setMemberStatus(DefaultNumberConstants.ONE_NUMBER); //线索跟进状态修改
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (clueMiddle.getClueCallStatus() != null) {
|
|
|
|
|
clueMiddleOne.setClueCallStatus(clueMiddle.getClueCallStatus());
|
|
|
|
|