diff --git a/PARR.BLL/Services/Implementations/CalendarService.cs b/PARR.BLL/Services/Implementations/CalendarService.cs index a82ffd18..7a7a0398 100644 --- a/PARR.BLL/Services/Implementations/CalendarService.cs +++ b/PARR.BLL/Services/Implementations/CalendarService.cs @@ -20,13 +20,13 @@ namespace PARR.BLL.Services.Implementations switch (periodType) { case (DistributionPeriodTypeEnum.Day): - return startPeriod.AddDays(ParseInt(distributionPeriod)); + return startPeriod.AddDays(ParseInt(distributionPeriod)).AddDays(-1); case (DistributionPeriodTypeEnum.Month): - return startPeriod.AddMonths(ParseInt(distributionPeriod)); + return startPeriod.AddMonths(ParseInt(distributionPeriod)).AddDays(-1); case (DistributionPeriodTypeEnum.Year): - return startPeriod.AddYears(ParseInt(distributionPeriod)); + return startPeriod.AddYears(ParseInt(distributionPeriod)).AddDays(-1); //case (DistributionPeriodTypeEnum.TimeSpan): // var timeSpan = ParseTimeSpan(distributionPeriod); @@ -81,7 +81,8 @@ namespace PARR.BLL.Services.Implementations //временно сделаем список руками рабочих дней var workDays = GetDatesForPeriod(startPeriod, endPeriod); - workDays = workDays.Where(t => weekends.Any(x => x != t)).ToList(); + if (weekends.Any()) + workDays = workDays.Where(t => weekends.Any(x => x != t)).ToList(); return workDays; } diff --git a/PARR.Test/Worker.cs b/PARR.Test/Worker.cs index ec01fdb9..d6622365 100644 --- a/PARR.Test/Worker.cs +++ b/PARR.Test/Worker.cs @@ -59,18 +59,23 @@ namespace PARR.Test //using (var scope = serviceProvider.CreateScope()) //{ - // var service = scope.ServiceProvider.GetService(); - - // var aaa = await service!.Get().ToListAsync(); - - // foreach (var aaaItem in aaa) { - - // var bbbb = aaaItem.AddDate; + // var service = scope.ServiceProvider.GetService(); + // var weekEndService = scope.ServiceProvider.GetService(); - // var now = DateTimeOffset.UtcNow; - // var newwww = now.AddMicroseconds(bbbb.); - // } + // var aa = service!.GetWorkDatesForPeriod(new DateOnly(2024, 07, 01), DistributionPeriodTypeEnum.Year, "1", weekEndService!.GetWeekends); + + // //var aaa = await service!.Get().ToListAsync(); + + // //foreach (var aaaItem in aaa) + // //{ + + // // var bbbb = aaaItem.AddDate; + + + // // var now = DateTimeOffset.UtcNow; + // // var newwww = now.AddMicroseconds(bbbb.); + // //} //}