|
|
@@ -67,6 +67,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.AcceptTypeCode), p => p.AcceptTypeCode == dto.AcceptTypeCode)
|
|
|
.WhereIF(dto.StartTime.HasValue, p => p.CreationTime >= dto.StartTime)
|
|
|
.WhereIF(dto.EndTime.HasValue, p => p.CreationTime < dto.EndTime)
|
|
|
+ .OrderByDescending(p=>p.CreationTime)
|
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<OrderDto>(total, _mapper.Map<IReadOnlyList<OrderDto>>(items));
|
|
|
@@ -91,6 +92,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(dto.StartTime.HasValue, p => p.CreationTime >= dto.StartTime)
|
|
|
.WhereIF(dto.EndTime.HasValue, p => p.CreationTime < dto.EndTime)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.AreaCode), p => p.AreaCode == dto.AreaCode)
|
|
|
+ .OrderByDescending(p => p.CreationTime)
|
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<OrderDto>(total, _mapper.Map<IReadOnlyList<OrderDto>>(items));
|
|
|
@@ -111,7 +113,6 @@ namespace Hotline.Api.Controllers
|
|
|
.Where(p => p.IsArrive == true && p.BulletinState == EBulletinState.ReviewPass)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.BulletinTypeId), d => d.BulletinTypeId == dto.BulletinTypeId)
|
|
|
.OrderByDescending(p => p.BulletinTime)
|
|
|
- .OrderByDescending(d => d.BulletinTime)
|
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<BulletinDto>(total, _mapper.Map<IReadOnlyList<BulletinDto>>(items));
|
tangjiang