yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix -before处理

Browse Source
This commit is contained in:
liguoyang
2025-03-05 15:52:03 +08:00
parent 2c8007d40d
commit 70259c2bad
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
View File

@@ -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))