|
@@ -348,7 +348,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.FlowEDate), (op, p) => p.StartTime <= DateTime.Parse(DateTime.Parse(dto.FlowEDate).ToString("yyyy-MM-dd 00:00:00")))// dto.FlowEDate
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.FlowFrom), (op, p) => p.FromName.Contains(dto.FlowFrom))
|
|
|
.WhereIF(dto.IdentityType.HasValue, (op, p) => p.IdentityType == dto.IdentityType)
|
|
|
- .OrderByDescending((op, p) => p.CreationTime)
|
|
|
+ .OrderByDescending((op, p) => op.CreationTime)
|
|
|
.Select((op, p) => new OrderListDto
|
|
|
{
|
|
|
FlowID = p.Id,
|
|
@@ -388,8 +388,8 @@ namespace Hotline.Api.Controllers
|
|
|
// });
|
|
|
|
|
|
var (total, items) = await queryNew
|
|
|
- .OrderByDescending(p => p.PubDate)
|
|
|
- .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
+ //.OrderByDescending(op => op.PubDate)
|
|
|
+ .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
//计算总页数
|
|
|
int nPageCount = Convert.ToInt32(Math.Ceiling(Convert.ToDouble(total) / dto.PageSize));
|