mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(bll): справления в CalnedarService

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2024-07-02 10:52:15 +10:00
parent 453164a4a0
commit 2cc5100576
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PARR.BLL/Services/Implementations/CalendarService.cs
View File

@@ -20,13 +20,13 @@ namespace PARR.BLL.Services.Implementations
switch (periodType) switch (periodType)
{ {
case (DistributionPeriodTypeEnum.Day): case (DistributionPeriodTypeEnum.Day):
return startPeriod.AddDays(ParseInt(distributionPeriod)); return startPeriod.AddDays(ParseInt(distributionPeriod)).AddDays(-1);
case (DistributionPeriodTypeEnum.Month): case (DistributionPeriodTypeEnum.Month):
return startPeriod.AddMonths(ParseInt(distributionPeriod)); return startPeriod.AddMonths(ParseInt(distributionPeriod)).AddDays(-1);
case (DistributionPeriodTypeEnum.Year): case (DistributionPeriodTypeEnum.Year):
return startPeriod.AddYears(ParseInt(distributionPeriod)); return startPeriod.AddYears(ParseInt(distributionPeriod)).AddDays(-1);
//case (DistributionPeriodTypeEnum.TimeSpan): //case (DistributionPeriodTypeEnum.TimeSpan):
// var timeSpan = ParseTimeSpan(distributionPeriod); // var timeSpan = ParseTimeSpan(distributionPeriod);
@@ -81,6 +81,7 @@ namespace PARR.BLL.Services.Implementations
//временно сделаем список руками рабочих дней //временно сделаем список руками рабочих дней
var workDays = GetDatesForPeriod(startPeriod, endPeriod); var workDays = GetDatesForPeriod(startPeriod, endPeriod);
if (weekends.Any())
workDays = workDays.Where(t => weekends.Any(x => x != t)).ToList(); workDays = workDays.Where(t => weekends.Any(x => x != t)).ToList();
return workDays; return workDays;

25
PARR.Test/Worker.cs
View File

@@ -59,18 +59,23 @@ namespace PARR.Test
//using (var scope = serviceProvider.CreateScope()) //using (var scope = serviceProvider.CreateScope())
//{ //{
// var service = scope.ServiceProvider.GetService<IDistributionPeriodService>(); // var service = scope.ServiceProvider.GetService<ICalendarService>();
// var weekEndService = scope.ServiceProvider.GetService<IWeekendDayService>();
// var aaa = await service!.Get().ToListAsync();
// foreach (var aaaItem in aaa) {
// var bbbb = aaaItem.AddDate;
// var now = DateTimeOffset.UtcNow; // var aa = service!.GetWorkDatesForPeriod(new DateOnly(2024, 07, 01), DistributionPeriodTypeEnum.Year, "1", weekEndService!.GetWeekends);
// var newwww = now.AddMicroseconds(bbbb.);
// } // //var aaa = await service!.Get().ToListAsync();
// //foreach (var aaaItem in aaa)
// //{
// // var bbbb = aaaItem.AddDate;
// // var now = DateTimeOffset.UtcNow;
// // var newwww = now.AddMicroseconds(bbbb.);
// //}
//} //}