|
|
|
@ -12,7 +12,6 @@ import cn.hutool.json.JSONObject;
|
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
|
import com.baiye.constant.ClueTypeConstants;
|
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
|
import com.baiye.constant.SecurityConstants;
|
|
|
|
|
import com.baiye.constant.SourceLabelConstants;
|
|
|
|
|
import com.baiye.exception.BadRequestException;
|
|
|
|
|
import com.baiye.feign.OrganizeClient;
|
|
|
|
@ -58,7 +57,6 @@ public class ReportTokerServiceImpl implements ReportTokerService {
|
|
|
|
|
private final ClueMiddleRepository clueMiddleRepository;
|
|
|
|
|
private final ClueTalkRepository clueTalkRepository;
|
|
|
|
|
private final OrganizeClient organizeClient;
|
|
|
|
|
private static final DateTime TODAY = DateUtil.date();
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<Map<String, Object>> reportTokerBroken(ReportTokerDTO reportTokerDTO) {
|
|
|
|
@ -459,7 +457,7 @@ public class ReportTokerServiceImpl implements ReportTokerService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//今日实时
|
|
|
|
|
if (clueMiddle.getNewestCallTime() != null && judgmentDate(clueMiddle.getNewestCallTime(), TODAY)) {
|
|
|
|
|
if (clueMiddle.getNewestCallTime() != null && judgmentDate(clueMiddle.getNewestCallTime(), DateUtil.date())) {
|
|
|
|
|
if (clueMiddle.getClueCallStatus() == DefaultNumberConstants.ONE_NUMBER) {
|
|
|
|
|
report.setUsrNum(report.getUsrNum() + 1);
|
|
|
|
|
} else if (clueMiddle.getClueCallStatus() == DefaultNumberConstants.TWO_NUMBER) {
|
|
|
|
@ -487,7 +485,7 @@ public class ReportTokerServiceImpl implements ReportTokerService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//今日实时
|
|
|
|
|
if (clueTalk.getNewestCallTime() != null && judgmentDate(clueTalk.getNewestCallTime(), TODAY)) {
|
|
|
|
|
if (clueTalk.getNewestCallTime() != null && judgmentDate(clueTalk.getNewestCallTime(), DateUtil.date())) {
|
|
|
|
|
if (clueTalk.getClueCallStatus() == DefaultNumberConstants.ONE_NUMBER) {
|
|
|
|
|
report.setUsrNum(report.getUsrNum() + 1);
|
|
|
|
|
} else if (clueTalk.getClueCallStatus() == DefaultNumberConstants.TWO_NUMBER) {
|
|
|
|
|