Sfoglia il codice sorgente

自定义排序包含紧急排序

Dun.Jason 5 mesi fa
parent
commit
ebeecf7188

+ 1 - 2
src/Hotline.Api/Controllers/OrderController.cs

@@ -3959,8 +3959,7 @@ public class OrderController : BaseController
             .WhereIF(dto.EndTime.HasValue, d => d.StartTime <= dto.EndTime)
             .WhereIF(dto.IsUrgent.HasValue, d => d.IsUrgent == dto.IsUrgent!.Value)
             .WhereIF(dto.Status.HasValue, d => d.Status == dto.Status)
-            .OrderByDescending(d=> d.IsUrgent)
-            .OrderByIF(string.IsNullOrEmpty(dto.SortField),d => d.StartTime ,OrderByType.Desc)
+            .OrderByIF(string.IsNullOrEmpty(dto.SortField),d => new { d.StartTime, d.IsUrgent }, OrderByType.Desc)
             .OrderByIF(dto is { SortField: "creationTime", SortRule:0 },d=> d.CreationTime,OrderByType.Asc) //创建时间升序
             .OrderByIF(dto is { SortField: "creationTime", SortRule: 1 }, d => d.CreationTime, OrderByType.Desc) //创建时间降序
             .OrderByIF(dto is { SortField: "startTime", SortRule: 0 }, d => d.StartTime, OrderByType.Asc) //受理时间升序

+ 1 - 2
src/Hotline.Application/Orders/OrderApplication.cs

@@ -2845,9 +2845,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .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 }, OrderByType.Desc)
+            .OrderByIF(dto.IsHandled == false, d => new { IsUrgent = d.IsUrgent,CreationTIme = d.CreationTime }, OrderByType.Desc)
             .OrderByIF(dto.IsHandled ==false, d=> new { d.Status })
-            .OrderByIF(dto.IsHandled == false && string.IsNullOrEmpty(dto.SortField),d => d.CreationTime,OrderByType.Desc)
             .OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, d => d.CreationTime, OrderByType.Asc) //创建时间升序
             .OrderByIF(dto is { SortField: "creationTime", SortRule: 1 }, d => d.CreationTime, OrderByType.Desc) //创建时间降序
             .OrderByIF(dto is { SortField: "startTime", SortRule: 0 }, d => d.StartTime, OrderByType.Asc) //受理时间升序