|
@@ -2531,6 +2531,7 @@ public class OrderController : BaseController
|
|
d => d.No.Contains(dto.Keyword) || d.Title.Contains(dto.Keyword))
|
|
d => d.No.Contains(dto.Keyword) || d.Title.Contains(dto.Keyword))
|
|
.WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == true,d=>d.CounterSignType.HasValue)
|
|
.WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == true,d=>d.CounterSignType.HasValue)
|
|
.WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == false,d=>!d.CounterSignType.HasValue)
|
|
.WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == false,d=>!d.CounterSignType.HasValue)
|
|
|
|
+ .Where(x=>x.Source< ESource.MLSQ && x.Source> ESource.WZSC)
|
|
.OrderByDescending(d => d.StartTime)
|
|
.OrderByDescending(d => d.StartTime)
|
|
.ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
.ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
|
|
|
|
@@ -2556,6 +2557,7 @@ public class OrderController : BaseController
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
d => d.No.Contains(dto.Keyword!) || d.Title.Contains(dto.Keyword!))
|
|
d => d.No.Contains(dto.Keyword!) || d.Title.Contains(dto.Keyword!))
|
|
.Where(d => string.IsNullOrEmpty(d.SignerId) || d.SignerId == _sessionContext.RequiredUserId)
|
|
.Where(d => string.IsNullOrEmpty(d.SignerId) || d.SignerId == _sessionContext.RequiredUserId)
|
|
|
|
+ .Where(x => x.Source < ESource.MLSQ && x.Source > ESource.WZSC)
|
|
.OrderBy(d => d.Status)
|
|
.OrderBy(d => d.Status)
|
|
.OrderByIF(dto.IsHandled == true, d => d.StartTime, OrderByType.Asc)
|
|
.OrderByIF(dto.IsHandled == true, d => d.StartTime, OrderByType.Asc)
|
|
.OrderByIF(dto.IsHandled == false, d => d.CreationTime, OrderByType.Desc)
|
|
.OrderByIF(dto.IsHandled == false, d => d.CreationTime, OrderByType.Desc)
|