|
|
@@ -2690,9 +2690,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
|
|
|
return query
|
|
|
// 交办件：已派单其他节点的工单，该选项卡下工单若办结就不显示
|
|
|
- .WhereIF(dto.TypeCode.HasValue && dto.TypeCode == 1, d => d.ProcessType == EProcessType.Jiaoban && d.Status < EOrderStatus.Filed)
|
|
|
+ .WhereIF(dto.TypeCode.HasValue == true && dto.TypeCode == 1, d => d.ProcessType == EProcessType.Jiaoban && d.Status < EOrderStatus.Filed)
|
|
|
// 办结件：当前登录坐席作为最初受理人已办结的工单
|
|
|
- .WhereIF(dto.TypeCode.HasValue && dto.TypeCode == 2, d=> d.Status >= EOrderStatus.Filed && d.AcceptorId == _sessionContextProvider.SessionContext.RequiredUserId)
|
|
|
+ .WhereIF(dto.TypeCode.HasValue == true && dto.TypeCode == 2, d=> d.Status >= EOrderStatus.Filed && d.AcceptorId == _sessionContextProvider.SessionContext.RequiredUserId)
|
|
|
.WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
|
|
|
.WhereIF(dto.IsHandled.HasValue, d => handleStatuses.Contains(d.Status))
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.StartsWith(dto.Keyword!))
|
|
|
@@ -2711,7 +2711,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
//.Where(d => string.IsNullOrEmpty(d.SignerId) || d.SignerId == _sessionContext.RequiredUserId)
|
|
|
.WhereIF(dto.IsUrgent.HasValue, d => d.IsUrgent == dto.IsUrgent.Value)
|
|
|
.Where(x => x.Source < ESource.MLSQ || x.Source > ESource.WZSC)
|
|
|
- .Where(x => x.Status != EOrderStatus.BackToProvince && x.Status < EOrderStatus.Filed)
|
|
|
+ .Where(x => x.Status != EOrderStatus.BackToProvince)
|
|
|
+ .WhereIF(dto.TypeCode.HasValue == false, m => m.Status < EOrderStatus.Filed)
|
|
|
.OrderBy(d => d.Status)
|
|
|
.OrderByIF(dto.IsHandled == true, d => d.StartTime, OrderByType.Desc)
|
|
|
.OrderByIF(dto.IsHandled == false, d => new { IsUrgent = d.IsUrgent, CreationTime = d.CreationTime }, OrderByType.Desc)
|
qinchaoyue