From ed5645768851587c37f9c380d3b1039849ab1b45 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 3 Jul 2025 14:30:16 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=88=B03=E7=82=B930;=20=E8=B0=83=E6=95=B4=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BalanceRecordUploadBackgroundService.cs | 2 +- .../TaskAssignment/Services/Implements/AssignmentService.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/Dlhis.Middle/BackgroundServices/BalanceRecordUploadBackgroundService.cs b/Src/Dlhis.Middle/BackgroundServices/BalanceRecordUploadBackgroundService.cs index db795431..8d9a7210 100644 --- a/Src/Dlhis.Middle/BackgroundServices/BalanceRecordUploadBackgroundService.cs +++ b/Src/Dlhis.Middle/BackgroundServices/BalanceRecordUploadBackgroundService.cs @@ -104,7 +104,7 @@ public class BalanceRecordUploadBackgroundService : BackgroundService try { - if (now is { Hour: 5, Minute: 1 } + if (now is { Hour: 3, Minute: 30 } && !_healthCheckService.GetIsOffline() && !await db.Queryable().Where(x => !x.IsSync).AnyAsync()) { diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index 36e98b17..15eafa98 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -251,10 +251,9 @@ public class AssignmentService : IAssignmentService .LeftJoin((deviceTask, device, ga, gaLeave) => deviceTask.UserNo == gaLeave.No) .LeftJoin((deviceTask, device, ga, gaLeave, department) => department.No == ga.DepartmentNo) .LeftJoin((deviceTask, device, ga, gaLeave, department, deviceRegistry) => deviceRegistry.DeviceUniqueNo == deviceTask.DeviceUniqueNo) - .WhereIF(request.DeviceUniqueNo.IsPresent(), (deviceTask, device) => - deviceTask.DeviceUniqueNo == request.DeviceUniqueNo && + .Where((deviceTask, device) => deviceTask.CreateTime >= limitTime && - device.Enable && + deviceTask.DeviceUniqueNo == request.DeviceUniqueNo && deviceTask.Version < 10 ) .WhereIF(!request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Wait) @@ -265,6 +264,7 @@ public class AssignmentService : IAssignmentService .Where((deviceTask, device, ga, gaLeave, department, deviceRegistry) => device.HeartbeatInterval == 0 || SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) > DateTime.Now) #endif + .Where((deviceTask, device) => device.Enable) .OrderBy(deviceTask => new { deviceTask.CreateTime, Priority = SqlFunc.Desc(deviceTask.Priority) }) .Select((deviceTask, device, ga, gaLeave, department) => new TaskDto {