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

fix(bll): CalendarService исправлен рассчет выходных дней

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-09-13 12:17:09 +10:00
parent add572f438
commit bf3dca6782
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ namespace PARR.BLL.Services.Implementations
//Убираем праздники //Убираем праздники
if (weekends.Any()) if (weekends.Any())
workDays = workDays.Where(t => weekends.Any(x => x != t)).ToList(); workDays = workDays.Where(t => !weekends.Any(x => x == t)).ToList();
//Убираем числа старше 28, чтобы сравнять продолжительность с февралем //Убираем числа старше 28, чтобы сравнять продолжительность с февралем
workDays.RemoveAll(t => t.Day > 28); workDays.RemoveAll(t => t.Day > 28);

1
PARR.TemplateDistributor/TemplateDistributor.cs
View File

@@ -283,7 +283,6 @@ namespace PARR.TemplateDistributor
/// <returns></returns> /// <returns></returns>
public async Task<List<DateOnly>> GetWorkDaysAsync(ApplicationsInWork appInWork) public async Task<List<DateOnly>> GetWorkDaysAsync(ApplicationsInWork appInWork)
{ {
var period = appInWork.EsppSchValues.FirstOrDefault()?.EsppSchTypeValue?.DistributionPeriod; var period = appInWork.EsppSchValues.FirstOrDefault()?.EsppSchTypeValue?.DistributionPeriod;
var periodType = ParseDistributionPeriodType(period!.Type); var periodType = ParseDistributionPeriodType(period!.Type);
var startPeriod = await esppScheduleTransformService.GetStartPeriodForDateAsync(appInWork.Id, appInWork.ReferenceDate, appInWork.ReferenceDate, periodType, period.Duration); var startPeriod = await esppScheduleTransformService.GetStartPeriodForDateAsync(appInWork.Id, appInWork.ReferenceDate, appInWork.ReferenceDate, periodType, period.Duration);