diff --git a/PARR.API/Services/Implementations/WorkLoadService.cs b/PARR.API/Services/Implementations/WorkLoadService.cs index c383b099..09fa2599 100644 --- a/PARR.API/Services/Implementations/WorkLoadService.cs +++ b/PARR.API/Services/Implementations/WorkLoadService.cs @@ -19,7 +19,13 @@ namespace PARR.API.Services.Implementations //начинаем не с сегодняшнего дня, а с завтра, так как на сегодня уже некоторые работы были проведены и их дата изменилась //return DateTimeOffset.UtcNow.AddHours(timeZoneOffsetHours).Date.AddDays(1); - return calendarService.GetDateWithTimeZoneOffset(DateTimeOffset.UtcNow, timeZoneOffsetHours).Date.AddDays(1); + var dateWithTimeZoneOffset = calendarService.GetDateWithTimeZoneOffset(DateTimeOffset.UtcNow, timeZoneOffsetHours); + var dateWithAddDays = dateWithTimeZoneOffset.DateTime.AddDays(1); + + //var bbb = dateWithTimeZoneOffset.DateTime.AddDays(1); + + //return calendarService.GetDateWithTimeZoneOffset(DateTimeOffset.UtcNow, timeZoneOffsetHours).UtcDateTime.AddDays(1); + return dateWithAddDays; } @@ -45,7 +51,7 @@ namespace PARR.API.Services.Implementations //return daysList.OrderBy(t => t).ToList(); - var aaa = DateOnly.FromDateTime(startDate); + //var aaa = DateOnly.FromDateTime(startDate); return calendarService.GetDatesForPeriod(DateOnly.FromDateTime(startDate), DateOnly.FromDateTime(endDate)); } @@ -56,9 +62,13 @@ namespace PARR.API.Services.Implementations var startDate = GetStartDate(requestQuery.TimeZoneOffsetHours); var endDate = GetEndDate(requestQuery.IsMonth, requestQuery.TimeZoneOffsetHours); + //query = query.Where(t => + // t.NextRun.DateTime.Date >= startDate.Date && t.NextRun.DateTime.Date <= endDate.Date + // ); + query = query.Where(t => - t.NextRun.DateTime.Date >= startDate.Date && t.NextRun.DateTime.Date <= endDate.Date - ); + t.NextRun.DateTime.AddHours(requestQuery.TimeZoneOffsetHours).Date >= startDate.Date && t.NextRun.DateTime.AddHours(requestQuery.TimeZoneOffsetHours).Date <= endDate.Date + ); if (requestQuery.IsActiveTemplate.HasValue) query = query.Where(t => t.IsActiveTemplate == requestQuery.IsActiveTemplate.Value);