From 4ea2be0634f774a1497f24ecf678be5257f75b11 Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Tue, 28 Nov 2023 11:59:26 +1000 Subject: [PATCH] =?UTF-8?q?fix(dal):=20TransformService=20=D0=B2=20=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B4=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D1=83?= =?UTF-8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20lastRun=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=20=D1=83=D0=B6=D0=B5=20=D1=8F=D0=B2=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D0=B1=D1=83=D0=B4=D1=83=D1=89=D0=B8=D0=BC?= =?UTF-8?q?=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EsppScheduleTransformService.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/PARR.DAL/TransformServices/EsppScheduleTransformService.cs b/PARR.DAL/TransformServices/EsppScheduleTransformService.cs index e21a65e3..1788ec49 100644 --- a/PARR.DAL/TransformServices/EsppScheduleTransformService.cs +++ b/PARR.DAL/TransformServices/EsppScheduleTransformService.cs @@ -82,8 +82,15 @@ namespace PARR.DAL.TransformServices public List GetNextSchedule(EsppScheduleDto esppSchedule, DateTimeOffset lastRun) { // расписание на оставшееся на сегодня время. его так мало... + lastRun = lastRun.UtcDateTime; var schedules = new List(); var curTime = lastRun; + + //Если ещё не произошло то добавляем расписание, возможно это новое AiW и он ещё ниразу не запускался. + //lastRun это будущее + if (lastRun >= DateTimeOffset.UtcNow && lastRun <= DateTimeOffset.UtcNow.EndOfDay()) + schedules.Add(lastRun); + while (curTime < DateTimeOffset.UtcNow.EndOfDay()) { switch (esppSchedule.TypeSchedule.Id) @@ -118,20 +125,20 @@ namespace PARR.DAL.TransformServices public async Task GetNextDateAsync(Guid applicationInWorkId, DateTimeOffset lastRun) { - return GetNextDate(await GetEsppSchedule(applicationInWorkId), lastRun); + return GetNextDate(await GetEsppScheduleAsync(applicationInWorkId), lastRun); } public async Task> GetNextScheduleAsync(Guid applicationInWorkId, DateTimeOffset lastRun) { - var esppSchedule = await GetEsppSchedule(applicationInWorkId); + var esppSchedule = await GetEsppScheduleAsync(applicationInWorkId); var nextSchedule = GetNextSchedule(esppSchedule, lastRun); return nextSchedule; } - private async Task GetEsppSchedule(Guid applicationInWorkId) + private async Task GetEsppScheduleAsync(Guid applicationInWorkId) { var esppSchedule = await esppSchTypeConfigService.GetEsppScheduleDtoAsync(applicationInWorkId); if (esppSchedule == null)