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

feat(api): JobControl добавлена сортировка имени аттрибута

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-09-22 17:15:30 +10:00
parent 40ce7acb41
commit 1f08b46085
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PARR.API/Controllers/V1/JobController.cs
View File

@@ -88,10 +88,10 @@ namespace PARR.API.Controllers.V1
query = query query = query
.Include(t => t.UnitFilters) .Include(t => t.UnitFilters)
.ThenInclude(t => t.FieldFilters) .ThenInclude(t => t.FieldFilters.OrderBy(o => o.UnitField!.AihitName))
.ThenInclude(t => t.UnitField) .ThenInclude(t => t.UnitField)
.Include(t => t.UnitFilters) .Include(t => t.UnitFilters)
.ThenInclude(t => t.RelationshipFilters) .ThenInclude(t => t.RelationshipFilters.OrderBy(o => o.UnitField!.AihitName))
.ThenInclude(t => t.UnitField); .ThenInclude(t => t.UnitField);
} }
@@ -125,10 +125,10 @@ namespace PARR.API.Controllers.V1
.Include(t => t.Tnk) .Include(t => t.Tnk)
.Include(t => t.Group) .Include(t => t.Group)
.Include(t => t.UnitFilters) .Include(t => t.UnitFilters)
.ThenInclude(t => t.FieldFilters) .ThenInclude(t => t.FieldFilters.OrderBy(o=>o.UnitField!.AihitName))
.ThenInclude(t => t.UnitField) .ThenInclude(t => t.UnitField)
.Include(t => t.UnitFilters) .Include(t => t.UnitFilters)
.ThenInclude(t => t.RelationshipFilters) .ThenInclude(t => t.RelationshipFilters.OrderBy(o => o.UnitField!.AihitName))
.FirstOrDefaultAsync(t => t.Id == id); .FirstOrDefaultAsync(t => t.Id == id);
if (job == null) if (job == null)
@@ -185,10 +185,10 @@ namespace PARR.API.Controllers.V1
.Include(t => t.Tnk) .Include(t => t.Tnk)
.Include(t => t.Group) .Include(t => t.Group)
.Include(t => t.UnitFilters) .Include(t => t.UnitFilters)
.ThenInclude(t => t.FieldFilters) .ThenInclude(t => t.FieldFilters.OrderBy(o => o.UnitField!.AihitName))
.ThenInclude(t => t.UnitField) .ThenInclude(t => t.UnitField)
.Include(t => t.UnitFilters) .Include(t => t.UnitFilters)
.ThenInclude(t => t.RelationshipFilters) .ThenInclude(t => t.RelationshipFilters.OrderBy(o => o.UnitField!.AihitName))
.FirstOrDefaultAsync(t => t.Id == job.Id); .FirstOrDefaultAsync(t => t.Id == job.Id);
var locationUri = uriService.GetUri(ApiRoutes.Job.Get, ApiRoutes.Job.getParam, createdJob!.Id); var locationUri = uriService.GetUri(ApiRoutes.Job.Get, ApiRoutes.Job.getParam, createdJob!.Id);