From 33beb39408432828f15d6fe41936c175a47a0bea Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 26 Feb 2024 17:50:22 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=96=E5=8F=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskAssignment/Job/CreateSyncServerDateTimeJob.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateSyncServerDateTimeJob.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateSyncServerDateTimeJob.cs index 3729ea1b..35a3ecce 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateSyncServerDateTimeJob.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateSyncServerDateTimeJob.cs @@ -1,6 +1,7 @@ using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Device.Entities; using Dlhis.Entity.Device.Enums; +using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar.Services; namespace Dlhis.ScheduledTask.TaskAssignment.Job @@ -19,16 +20,18 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Job public async Task RunAsync() { - _dbContext.Client.QueryFilter.ClearAndBackup(); + _dbContext.Client.QueryFilter.ClearAndBackup(); try { - var deviceUniqueNos = await _dbContext.Queryable().Where(x => x.Status == DeviceTaskStatusEnumType.Wait) + var deviceUniqueNos = await _dbContext.Queryable() + .Where(x => x.Status == DeviceTaskStatusEnumType.Wait || x.Status == DeviceTaskStatusEnumType.Process) .Where(x => x.Type == DeviceTaskEnumType.SyncDateTime) .Select(x => x.DeviceUniqueNo) + .Distinct() .ToListAsync(); var devices = await _dbContext.Queryable() - .Where(x => deviceUniqueNos.Contains(x.UniqueNo)) + .Where(x => !deviceUniqueNos.Contains(x.UniqueNo)) .Where(x => x.Enable) .ToListAsync(); @@ -54,7 +57,7 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Job } catch (Exception ex) { - _logger.LogError(ex, "生成同步时间任务失败:" + ex.Message); + _logger.LogError(ex, "生成同步时间任务失败:{message}", ex.Message); } finally {