From 70259c2bade1be5cc3f1ad12c496c8b02735421d Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 5 Mar 2025 15:52:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=20-before=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/DeviceUploadLogService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index 8a4eb965..5ab7ee3d 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -110,7 +110,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService { Type = x.Type.GetDescription(), x.Before, x.Start, x.End, x.After, x.TenantId }).ToList(); - + workGridInfo.WorkGrid = new { workGridUser.WorkGridCode, @@ -124,7 +124,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService var currentDayWorkGridSchedule = workGridSchedules.FirstOrDefault(x => x.PeriodType == WorkGridTimePeriodEnumType.Day && x.Date == currentDateOnly); if (currentDayWorkGridTimePeriod != null && currentDayWorkGridSchedule != null) { - var start = currentDate.Add(currentDayWorkGridTimePeriod.Start.AddMinutes(currentDayWorkGridTimePeriod.Before).ToTimeSpan()); + var start = currentDate.Add(currentDayWorkGridTimePeriod.Start.AddMinutes(-currentDayWorkGridTimePeriod.Before).ToTimeSpan()); var end = currentDate.Add(currentDayWorkGridTimePeriod.End.AddMinutes(currentDayWorkGridTimePeriod.After).ToTimeSpan()); if (request.RaiseDateTime >= start && request.RaiseDateTime <= end) @@ -138,7 +138,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService .Where(x => x.PeriodType == WorkGridTimePeriodEnumType.Night && (x.Date == currentDateOnly || x.Date == currentDateOnly.AddDays(-1))).ToList(); if (currentNightWorkGridTimePeriod != null && currentNightWorkGridSchedules.Any()) { - var startTime = currentNightWorkGridTimePeriod.Start.AddMinutes(currentNightWorkGridTimePeriod.Before); + var startTime = currentNightWorkGridTimePeriod.Start.AddMinutes(-currentNightWorkGridTimePeriod.Before); var endTime = currentNightWorkGridTimePeriod.End.AddMinutes(currentNightWorkGridTimePeriod.After); if (currentNightWorkGridSchedules.Any(x => x.Date == currentDateOnly))