|
@@ -165,7 +165,7 @@ namespace DataSharing.Host.Controllers
|
|
|
/// <returns></returns>
|
|
|
[HttpGet("getorderlist")]
|
|
|
[AllowAnonymous]
|
|
|
- public async Task<PagedDto<DsOrder>> GetOrderlist([FromQuery] QuerySendTaskDto dto)
|
|
|
+ public async Task<PagedDto<object>> GetOrderlist([FromQuery] QuerySendTaskDto dto)
|
|
|
{
|
|
|
if (!dto.StartTime.HasValue)
|
|
|
dto.StartTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
|
|
@@ -239,7 +239,7 @@ namespace DataSharing.Host.Controllers
|
|
|
.WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => SqlFunc.DateDiff(DateType.Second, p.StartTime.Value, p.FirstSendProvinceTime.Value) > 180)//不及时上传
|
|
|
.OrderByDescending(p => p.CreationTime)
|
|
|
.ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
|
|
|
- return new PagedDto<DsOrder>(total, _mapper.Map<IReadOnlyList<DsOrder>>(items));
|
|
|
+ return new PagedDto<object>(total, items);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -249,7 +249,7 @@ namespace DataSharing.Host.Controllers
|
|
|
/// <returns></returns>
|
|
|
[HttpGet("getcalllist")]
|
|
|
[AllowAnonymous]
|
|
|
- public async Task<PagedDto<DsTelCall>> GetCalllist([FromQuery] QuerySendTaskDto dto)
|
|
|
+ public async Task<PagedDto<object>> GetCalllist([FromQuery] QuerySendTaskDto dto)
|
|
|
{
|
|
|
if (!dto.StartTime.HasValue)
|
|
|
dto.StartTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
|
|
@@ -323,7 +323,7 @@ namespace DataSharing.Host.Controllers
|
|
|
.WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => SqlFunc.DateDiff(DateType.Second, p.OverTime.Value, p.FirstSendProvinceTime.Value) > 180)//不及时
|
|
|
.OrderByDescending(p => p.CreationTime)
|
|
|
.ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
|
|
|
- return new PagedDto<DsTelCall>(total, _mapper.Map<IReadOnlyList<DsTelCall>>(items));
|
|
|
+ return new PagedDto<object>(total, items);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -398,11 +398,11 @@ namespace DataSharing.Host.Controllers
|
|
|
NotContainTel = SqlFunc.AggregateSum(SqlFunc.IIF(p.CaseSourceCode == "RGDH" && p.CallId == null, 1, 0)),//未匹配数
|
|
|
|
|
|
HandleEndOrderNum = SqlFunc.AggregateSum(SqlFunc.IIF(p.HandleState == "办理完成", 1, 0)),//办结件数
|
|
|
- HandleEndOrderOnTime = SqlFunc.AggregateSum(SqlFunc.IIF(p.HandleState == "办理完成" && p.ExpiredTime < p.ActualHandleTime, 1, 0)),//按时办结件数
|
|
|
+ HandleEndOrderOnTime = SqlFunc.AggregateSum(SqlFunc.IIF(p.HandleState == "办理完成" && p.ExpiredTime > p.ActualHandleTime, 1, 0)),//按时办结件数
|
|
|
})
|
|
|
.ToListAsync();
|
|
|
|
|
|
- ///电话
|
|
|
+ //电话
|
|
|
var callRate = await _dsTelCallRepository.Queryable()
|
|
|
.Where(p => p.OverTime >= StartDate && p.OverTime <= EndDate && p.FirstSendProvinceTime >= StartDate && p.FirstSendProvinceTime <= EndDate)
|
|
|
.Where(p => p.FirstSendProvinceTime.HasValue)
|