From 25f8c783408a2e88a2ab7ad9df3740d20af15433 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 25 Dec 2024 13:25:14 +0800 Subject: [PATCH] =?UTF-8?q?stop=20=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskAssignment/Services/Implements/AssignmentService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index 71a7bcd9..ae3270b7 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -34,6 +34,8 @@ public class AssignmentService : IAssignmentService public async Task> DeviceGetTasksAsync(DeviceTaskGetRequest request) { + return new List();//todo + var data = await GetDataAsync(request); if (data.IsEmpty()) return new List(); @@ -264,7 +266,7 @@ public class AssignmentService : IAssignmentService device.HeartbeatInterval == 0 || SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) > DateTime.Now) #if !DEBUG #endif - .OrderBy(deviceTask => new { Priority = SqlFunc.Desc(deviceTask.Priority), deviceTask.CreateTime }) + .OrderBy(deviceTask => new { deviceTask.CreateTime, Priority = SqlFunc.Desc(deviceTask.Priority) }) .Select((deviceTask, device, deviceTemplate, ga, gaLeave, department) => new TaskDto { UserId = deviceTask.UserId == 0 || deviceTask.UserId == null