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

fix(esppSchedule): исправлено сравнение nextRun: espp, db, calc

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-02-27 09:33:27 +10:00
parent c718a4b406
commit f7a2170454
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PARR.DAL/Services/Abstracts/BaseService.cs
View File

@@ -69,7 +69,7 @@ namespace PARR.DAL.Services.Abstracts
try try
{ {
var changedCount = await EntitiContext.SaveChangesAsync(); var changedCount = await EntitiContext.SaveChangesAsync();
logger.LogInformation("Успешно сохранено {ChangedCount} изменений в БД для объектов типа {EntityType}", logger.LogDebug("Успешно сохранено {ChangedCount} изменений в БД для объектов типа {EntityType}",
changedCount, typeof(T).Name); changedCount, typeof(T).Name);
return true; return true;
} }

18
PARR.EsppScheduleSync/ScheduleSyncher.cs
View File

@@ -273,16 +273,26 @@ namespace PARR.EsppScheduleSync
logger.LogDebug("Рассчитанные значения для шаблона '{templateName}', {templateId}, следующее срабатывание {scheduledCalculated}, время создания наряда: {basisTimeCalculated}", logger.LogDebug("Рассчитанные значения для шаблона '{templateName}', {templateId}, следующее срабатывание {scheduledCalculated}, время создания наряда: {basisTimeCalculated}",
dbObject.TemplateName, templateId, scheduledCalculated, basisTimeCalculated); dbObject.TemplateName, templateId, scheduledCalculated, basisTimeCalculated);
if (EsppSyncHelpers.Normalize(dbObject.Scheduled) != EsppSyncHelpers.Normalize(esppObject.Scheduled) || EsppSyncHelpers.Normalize(dbObject.Scheduled) != scheduledCalculated || EsppSyncHelpers.Normalize(esppObject.Scheduled) != scheduledCalculated) var dbScheduledNormalized = EsppSyncHelpers.Normalize(dbObject.Scheduled);
var esppScheduledNormalized = EsppSyncHelpers.Normalize(esppObject.Scheduled);
var scheduleCalculatedNormalized = EsppSyncHelpers.Normalize(scheduledCalculated);
//if (EsppSyncHelpers.Normalize(dbObject.Scheduled) != EsppSyncHelpers.Normalize(esppObject.Scheduled) || EsppSyncHelpers.Normalize(dbObject.Scheduled) != scheduledCalculated || EsppSyncHelpers.Normalize(esppObject.Scheduled) != scheduledCalculated)
if (dbScheduledNormalized != esppScheduledNormalized || dbScheduledNormalized != scheduleCalculatedNormalized || esppScheduledNormalized != scheduleCalculatedNormalized)
{ {
logger.LogInformation("Не совпадают поля ({propName}), dbValueStr: {dbValueStr}, esppValueStr: {esppValueStr}, scheduledCalculated: {scheduledCalculated}. Имя шаблона: {templateName}", logger.LogInformation("Не совпадают поля ({PropertyName}), dbValueStr: {dbValueStr}, esppValueStr: {esppValueStr}, scheduledCalculated: {scheduledCalculated}. Имя шаблона: {templateName}",
nameof(dbObject.Scheduled), dbObject.Scheduled, esppObject.Scheduled, scheduledCalculated, dbObject.TemplateName); nameof(dbObject.Scheduled), dbObject.Scheduled, esppObject.Scheduled, scheduledCalculated, dbObject.TemplateName);
return false; return false;
} }
if (EsppSyncHelpers.Normalize(dbObject.BasisTime) != EsppSyncHelpers.Normalize(esppObject.BasisTime) || EsppSyncHelpers.Normalize(dbObject.BasisTime) != basisTimeCalculated || EsppSyncHelpers.Normalize(esppObject.BasisTime) != basisTimeCalculated) var dbBasisTimeNormalized = EsppSyncHelpers.Normalize(dbObject.BasisTime);
var esppBasisTimeNormalized = EsppSyncHelpers.Normalize(esppObject.BasisTime);
var calculatedBasisTimeNormalized = EsppSyncHelpers.Normalize(basisTimeCalculated);
//if (EsppSyncHelpers.Normalize(dbObject.BasisTime) != EsppSyncHelpers.Normalize(esppObject.BasisTime) || EsppSyncHelpers.Normalize(dbObject.BasisTime) != basisTimeCalculated || EsppSyncHelpers.Normalize(esppObject.BasisTime) != basisTimeCalculated)
if (dbBasisTimeNormalized != esppBasisTimeNormalized || dbBasisTimeNormalized != calculatedBasisTimeNormalized || esppBasisTimeNormalized != calculatedBasisTimeNormalized)
{ {
logger.LogInformation("Не совпадают поля ({propName}), dbValueStr: {dbValueStr}, esppValueStr: {esppValueStr}, basisTimeCalculated: {basisTimeCalculated}. Имя шаблона: {templateName}", logger.LogInformation("Не совпадают поля ({PropertyName}), dbValueStr: {dbValueStr}, esppValueStr: {esppValueStr}, basisTimeCalculated: {basisTimeCalculated}. Имя шаблона: {templateName}",
nameof(dbObject.BasisTime), dbObject.BasisTime, esppObject.BasisTime, basisTimeCalculated, dbObject.TemplateName); nameof(dbObject.BasisTime), dbObject.BasisTime, esppObject.BasisTime, basisTimeCalculated, dbObject.TemplateName);
return false; return false;
} }