|
@@ -4228,7 +4228,7 @@ public class OrderController : BaseController
|
|
IsScreen = d.OrderScreens.Any(x => x.Status == EScreenStatus.End),
|
|
IsScreen = d.OrderScreens.Any(x => x.Status == EScreenStatus.End),
|
|
TerminateStatus = d.OrderTerminates.OrderByDescending(p => p.CreationTime).Select(p => p.Status).FirstOrDefault()
|
|
TerminateStatus = d.OrderTerminates.OrderByDescending(p => p.CreationTime).Select(p => p.Status).FirstOrDefault()
|
|
}, true)
|
|
}, true)
|
|
- //.MergeTable()
|
|
|
|
|
|
+ //.MergeTable()
|
|
//.OrderByIF(_appOptions.Value.IsZiGong, d => d.TerminateStatus, OrderByType.Desc)
|
|
//.OrderByIF(_appOptions.Value.IsZiGong, d => d.TerminateStatus, OrderByType.Desc)
|
|
.OrderByDescending(d => d.CreationTime)
|
|
.OrderByDescending(d => d.CreationTime)
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|