From b3b1952ba0b3686b71bd8e3ae2fc13f297000839 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Sat, 20 Apr 2024 15:37:08 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=81=A2=E5=A4=8D=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/AssignmentService.cs | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index fb628937..108d4a36 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -272,21 +272,21 @@ public class AssignmentService : IAssignmentService return page.Data; } - //var taskIdVs = page.Data.Select(x => new { x.TaskId, x.Version, x.Status }).ToList(); - //var where = LinqExpressionExtensions.False(); - //taskIdVs.ForEach(p => - //{ - // where = where.Or(x => x.Id == p.TaskId && x.Version == p.Version && x.Status == p.Status); - //}); + var taskIdVs = page.Data.Select(x => new { x.TaskId, x.Version, x.Status }).ToList(); + var where = LinqExpressionExtensions.False(); + taskIdVs.ForEach(p => + { + where = where.Or(x => x.Id == p.TaskId && x.Version == p.Version && x.Status == p.Status); + }); - //var effecet = await _dbContext.Updateable() - // .SetColumns(x => x.Version == x.Version + 1) - // .SetColumns(x => x.Status == DeviceTaskStatusEnumType.Process) - // .SetColumns(x => x.ModifiedTime == DateTime.Now) - // .Where(where) - // .ExecuteCommandAsync(); + var effecet = await _dbContext.Updateable() + .SetColumns(x => x.Version == x.Version + 1) + .SetColumns(x => x.Status == DeviceTaskStatusEnumType.Process) + .SetColumns(x => x.ModifiedTime == DateTime.Now) + .Where(where) + .ExecuteCommandAsync(); - //(taskIdVs.Count != effecet).ThrowIfTrue("获取任务失败"); + (taskIdVs.Count != effecet).ThrowIfTrue("获取任务失败"); return page.Data;