|
@@ -88,8 +88,7 @@ public abstract class CallReportApplicationBase : ICallReportApplication
|
|
|
int connectByeTimes = _systemSettingCacheManager.ConnectByeTimes;
|
|
|
|
|
|
var callData = await _callNativeRepository.Queryable()
|
|
|
- .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime && p.GroupId != "0")
|
|
|
- // .Where(p => p.Gateway != "82826886" && SqlFunc.Length(p.Gateway) != 4)
|
|
|
+ .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime && p.CallState != ECallState.Invalid)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), p => p.ToNo == dto.Keyword)
|
|
|
.GroupBy(p => p.CreationTime.ToString("yyyy-MM-dd"))
|
|
|
.Select(p => new QueryCallsDetailDto
|
|
@@ -124,7 +123,7 @@ public abstract class CallReportApplicationBase : ICallReportApplication
|
|
|
var recordPrefix = _systemSettingCacheManager.RecordPrefix;
|
|
|
var query = _callNativeRepository.Queryable()
|
|
|
.LeftJoin<Order>((p, o) => p.Id == o.CallId)
|
|
|
- .Where((p, o) => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime && p.Direction == ECallDirection.In)
|
|
|
+ .Where((p, o) => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime && p.Direction == ECallDirection.In && p.CallState != ECallState.Invalid)
|
|
|
.WhereIF(dto.TypeCode == "2", (p, o) => p.AnsweredTime != null)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), (p, o) => p.TelNo == dto.Keyword)
|
|
|
.OrderByDescending((p, o) => p.CreationTime)
|