From e3720d6905ffd6b854c84da744fd3261ac85eb5d Mon Sep 17 00:00:00 2001 From: liguoyang Date: Sat, 5 Jul 2025 13:54:11 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BD=BF=E7=94=A8id=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/AssignmentService.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index 2dc4f35a..840c49bb 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -340,17 +340,6 @@ public class AssignmentService : IAssignmentService DeviceTaskEnumType.SyncDateTime }; - //排除UploadRecord,SyncDateTime的任务，获取最近的任务ID - var limitData = await _dbContext.Queryable() - .Where(x => x.ModifiedTime >= limitTime) - .Where(x => x.DeviceUniqueNo == deviceUniqueNo) - .Where(x => !types.Contains(x.Type)) - .OrderBy(x => x.Id) - .Select(x => new { x.Id }) - .FirstAsync(); - - var startId = limitData?.Id; - //获取其他任务ID var otherIds = await _dbContext.Queryable() .Where(x => x.DeviceUniqueNo == deviceUniqueNo) @@ -359,6 +348,17 @@ public class AssignmentService : IAssignmentService .Select(x => x.Id) .ToListAsync(); + //排除UploadRecord,SyncDateTime的任务，获取最近的任务ID + var limitData = await _dbContext.Queryable() + .Where(x => x.ModifiedTime >= limitTime) + .Where(x => x.DeviceUniqueNo == deviceUniqueNo) + .Where(x => !otherIds.Contains(x.Id)) + .OrderBy(x => x.Id) + .Select(x => new { x.Id }) + .FirstAsync(); + + var startId = limitData?.Id; + return (startId, otherIds); }