Merge branch 'template-generator-worker' into dev

This commit is contained in:
Mikhail Kuznetsov
2025-08-19 11:15:17 +10:00
21 changed files with 521 additions and 20 deletions

View File

@@ -66,8 +66,6 @@ namespace PARR.DAL.DomainServices.Implementations
.ThenInclude(t => t.UnitValues)
.ThenInclude(t => t.Value);
logger.LogInformation($"В baseQuery записей {await baseQuery.CountAsync()}");
foreach (var unitFilter in job.UnitFilters)
{
var query = baseQuery.Where(t => EF.Functions.ILike(t.Name, unitFilter.UnitFilter));
@@ -94,7 +92,6 @@ namespace PARR.DAL.DomainServices.Implementations
else
query = query.Where(t => !t.ParentUnits.Any() || !t.ParentUnits.Any(p => p.ParentUnit!.UnitValues.Any(pf => pf.FieldId == parentFilter.FieldId && (pf.Value!.Value != null && EF.Functions.ILike(pf.Value.Value, parentFilter.ValueMask)))));
}
logger.LogInformation($"!В query записей {await query.CountAsync()}");
}
}
var newUnits = await query.Select(t => t.Id).ToListAsync();