|
@@ -109,6 +109,7 @@ namespace DataSharing.Host.Controllers
|
|
|
.WhereIF(dto.EndTime.HasValue, p => p.CreationTime <= dto.EndTime)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Id), p => p.TaskId == dto.Id)
|
|
|
.WhereIF(dto.IsSuccess.HasValue, p => p.IsSuccess == dto.IsSuccess)
|
|
|
+ .OrderByDescending (p => p.CreationTime)
|
|
|
.ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
|
|
|
return new PagedDto<DsSendTaskInfo>(total, items);
|
|
|
}
|
|
@@ -195,7 +196,8 @@ namespace DataSharing.Host.Controllers
|
|
|
p.HotspotSpliceName,
|
|
|
p.ExpiredTime,
|
|
|
p.CaseType,
|
|
|
- p.CaseTypeCode
|
|
|
+ p.CaseTypeCode,
|
|
|
+ p.CreationTime
|
|
|
})
|
|
|
.MergeTable()
|
|
|
.Select(p => new
|
|
@@ -222,10 +224,12 @@ namespace DataSharing.Host.Controllers
|
|
|
p.HotspotSpliceName,
|
|
|
p.ExpiredTime,
|
|
|
p.CaseType,
|
|
|
- p.CaseTypeCode
|
|
|
+ p.CaseTypeCode,
|
|
|
+ p.CreationTime
|
|
|
})
|
|
|
.WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => SqlFunc.DateDiff(DateType.Second, p.StartTime.Value, p.FirstSendProvinceTime.Value) <= 180)//及时上传
|
|
|
.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));
|
|
|
}
|
|
@@ -275,8 +279,8 @@ namespace DataSharing.Host.Controllers
|
|
|
p.ProvinceNo,
|
|
|
p.FirstSendProvinceTime,
|
|
|
p.LastSendProvinceTime,
|
|
|
- p.TaskId
|
|
|
-
|
|
|
+ p.TaskId,
|
|
|
+ p.CreationTime
|
|
|
})
|
|
|
.MergeTable()
|
|
|
.Select(p => new
|
|
@@ -303,11 +307,13 @@ namespace DataSharing.Host.Controllers
|
|
|
p.ProvinceNo,
|
|
|
p.FirstSendProvinceTime,
|
|
|
p.LastSendProvinceTime,
|
|
|
- p.TaskId
|
|
|
+ p.TaskId,
|
|
|
+ p.CreationTime
|
|
|
|
|
|
})
|
|
|
.WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => SqlFunc.DateDiff(DateType.Second, p.OverTime.Value, p.FirstSendProvinceTime.Value) <= 180)//及时
|
|
|
.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));
|
|
|
|