From 867ecda20131f578eb40a94f3f3b6103742652ec Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Tue, 30 Dec 2025 14:12:49 +1000 Subject: [PATCH] =?UTF-8?q?feat(api):=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=80=D0=BE=D0=B1=D0=BE=D1=82=D0=B0=D0=BC=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=B4=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20=D1=81=D0=BD?= =?UTF-8?q?=D0=B0=D1=87=D0=B0=D0=BB=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D1=8B=D1=85=20=D1=88=D0=B0=D0=B1?= =?UTF-8?q?=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2,=20=D0=BF=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=BC=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D1=83=D0=B5=D1=82?= =?UTF-8?q?=D1=81=D1=8F=20=D0=BF=D0=BE=20NextRun=20=D0=B8=20=D0=B1=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D1=82=D1=81=D1=8F=20=D0=B1=D0=BB=D0=B8=D0=B6=D0=B0?= =?UTF-8?q?=D0=B9=D1=88=D0=B5=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.API/Controllers/V1/RobotTaskController.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/PARR.API/Controllers/V1/RobotTaskController.cs b/PARR.API/Controllers/V1/RobotTaskController.cs index 96d5aa26..547e8ca5 100644 --- a/PARR.API/Controllers/V1/RobotTaskController.cs +++ b/PARR.API/Controllers/V1/RobotTaskController.cs @@ -129,7 +129,7 @@ namespace PARR.API.Controllers.V1 .ThenInclude(t => t.ScheduleExcludeTypeCalendar) .Include(t => t.Template) .ThenInclude(t => t!.Job) - .ThenInclude(t=>t!.Tnk) + .ThenInclude(t => t!.Tnk) .Include(t => t.Template) .ThenInclude(t => t!.UnitsInTemplate); @@ -138,16 +138,21 @@ namespace PARR.API.Controllers.V1 .Where(t => t.RobotCode == (int)RobotsEnum.TemplateOrder && (t.TaskStatusCode == (int)TaskStatusEnum.Ok)) .Select(t => t.TemplateId); query = query.Where(t => t.RobotCode == (int)RobotsEnum.ScheduleOrder && createdTemplates.Contains(t.TemplateId)); - // query = query.Where(t => t.RobotCode == (int)RobotsEnum.ScheduleOrder && t.TemplateId==Guid.Parse("7cb7c3be-506d-40e0-a63f-4554edb52459")); + // query = query.Where(t => t.RobotCode == (int)RobotsEnum.ScheduleOrder && t.TemplateId==Guid.Parse("7cb7c3be-506d-40e0-a63f-4554edb52459")); break; default: break; } + #region old // сортируем по NextRun, чтобы те у которых дата след срабатывания ближе к текущей, выполнились скорее //query = query.Where(t => t.Template.Job.GroupId == Guid.Parse("8a75030e-d2dc-4006-a773-002db36ebe27")); - query = query.OrderBy(t => t.Template!.NextRun); + //query = query.OrderBy(t => t.Template!.NextRun); + #endregion + + // Сортируем сначала по StatusTypeId, т е те что used, будут первыми, потом сортируем по NextRun, чтобы ближайшие даты выполнились скорее + query = query.OrderBy(t => t.Template!.StatusTypeId).ThenBy(t => t.Template!.NextRun); RobotConfiguration? task = null;