From 1f08b46085f71d83622ecc71256cf2ef9230812d Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Mon, 22 Sep 2025 17:15:30 +1000 Subject: [PATCH] =?UTF-8?q?feat(api):=20JobControl=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=81=D0=BE=D1=80=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=B8=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=20=D0=B0=D1=82=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.API/Controllers/V1/JobController.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PARR.API/Controllers/V1/JobController.cs b/PARR.API/Controllers/V1/JobController.cs index a3b724c1..7f548644 100644 --- a/PARR.API/Controllers/V1/JobController.cs +++ b/PARR.API/Controllers/V1/JobController.cs @@ -88,10 +88,10 @@ namespace PARR.API.Controllers.V1 query = query .Include(t => t.UnitFilters) - .ThenInclude(t => t.FieldFilters) + .ThenInclude(t => t.FieldFilters.OrderBy(o => o.UnitField!.AihitName)) .ThenInclude(t => t.UnitField) .Include(t => t.UnitFilters) - .ThenInclude(t => t.RelationshipFilters) + .ThenInclude(t => t.RelationshipFilters.OrderBy(o => o.UnitField!.AihitName)) .ThenInclude(t => t.UnitField); } @@ -125,10 +125,10 @@ namespace PARR.API.Controllers.V1 .Include(t => t.Tnk) .Include(t => t.Group) .Include(t => t.UnitFilters) - .ThenInclude(t => t.FieldFilters) + .ThenInclude(t => t.FieldFilters.OrderBy(o=>o.UnitField!.AihitName)) .ThenInclude(t => t.UnitField) .Include(t => t.UnitFilters) - .ThenInclude(t => t.RelationshipFilters) + .ThenInclude(t => t.RelationshipFilters.OrderBy(o => o.UnitField!.AihitName)) .FirstOrDefaultAsync(t => t.Id == id); if (job == null) @@ -185,10 +185,10 @@ namespace PARR.API.Controllers.V1 .Include(t => t.Tnk) .Include(t => t.Group) .Include(t => t.UnitFilters) - .ThenInclude(t => t.FieldFilters) + .ThenInclude(t => t.FieldFilters.OrderBy(o => o.UnitField!.AihitName)) .ThenInclude(t => t.UnitField) .Include(t => t.UnitFilters) - .ThenInclude(t => t.RelationshipFilters) + .ThenInclude(t => t.RelationshipFilters.OrderBy(o => o.UnitField!.AihitName)) .FirstOrDefaultAsync(t => t.Id == job.Id); var locationUri = uriService.GetUri(ApiRoutes.Job.Get, ApiRoutes.Job.getParam, createdJob!.Id);