From 0d93a4843a7db4f72f701f71273fca56f72327fd Mon Sep 17 00:00:00 2001 From: Donghuang Date: Mon, 25 Oct 2021 14:48:37 +0800 Subject: [PATCH] cdr list by phone bug fixes --- .../cms/controller/CallDetailRecordController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java index 1bc42218..499e31d3 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java @@ -101,8 +101,15 @@ public class CallDetailRecordController else { val startDate = form.getStartDate(); val endDate = form.getEndDate(); - Assert.state(DateUtils.addDays(startDate, 14).after(endDate), - "查询时间范围不能大于14天"); + val calledNumber = form.getCalledNumber(); + + if (StringUtils.isNotBlank(calledNumber)) { + search.eq(CALLED_NUMBER, calledNumber); + } + else { + Assert.state(DateUtils.addDays(startDate, 14).after(endDate), + "无索引条件查询(被叫号码、ConnID)时间范围不能大于14天"); + } search.gt(START_STAMP, startDate); search.lt(START_STAMP, endDate); @@ -110,7 +117,6 @@ public class CallDetailRecordController doSearch(search::eq, CAMPAIGN_ID, form::getCampaignId, Objects::nonNull); doSearch(search::eq, ACCOUNT, form::getAccount, StringUtils::isNotBlank); doSearch(search::eq, CALLER_NUMBER, form::getCallerNumber, StringUtils::isNotBlank); - doSearch(search::eq, CALLED_NUMBER, form::getCalledNumber, StringUtils::isNotBlank); } search.eq(DELETED, false);