From 43d40d950e02ad2ecf936a3a9d511833c27084c6 Mon Sep 17 00:00:00 2001
From: Mikhail Kuznetsov <ivc_kuznetsovmv@dvgd.rzd>
Date: Tue, 13 Jan 2026 08:42:17 +1000
Subject: [PATCH] =?UTF-8?q?feat(api):=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B4=D0=B0=D1=87=D0=B8=20=D0=B7=D0=B0=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D1=80=D0=BE=D0=B1=D0=BE=D1=82=D1=83,=20?=
 =?UTF-8?q?=D1=81=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B0=20=D0=B7=D0=B0=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=87=D0=B8=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D1=83?=
 =?UTF-8?q?=D1=8E=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=20nextRun,=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=BC=20=D0=BF=D0=BE=20IsActiveSchedule=20?=
 =?UTF-8?q?=D0=B8=20=D0=B2=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD?=
 =?UTF-8?q?=D1=8E=D1=8E=20=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D1=8C=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20IsActiveTemplate.=20=D0=A1=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=20=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=B1?=
 =?UTF-8?q?=D1=8B=D1=81=D1=82=D1=80=D1=8B=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D0=B4=D0=B5=D0=B0=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D0=B2=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=85=D0=BE=D0=B4=D0=B8=D0=BB=D0=B8=20=D0=B1=D1=8B=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PARR.API/Controllers/V1/RobotTaskController.cs b/PARR.API/Controllers/V1/RobotTaskController.cs
index 78580948..ecbcd01e 100644
--- a/PARR.API/Controllers/V1/RobotTaskController.cs
+++ b/PARR.API/Controllers/V1/RobotTaskController.cs
@@ -147,7 +147,7 @@ namespace PARR.API.Controllers.V1
 
 
             // сортируем по NextRun, чтобы те у которых дата след срабатывания ближе к текущей, выполнились скорее
-            query = query.OrderBy(t => t.Template!.NextRun);
+            query = query.OrderBy(t => t.Template!.NextRun).ThenBy(t => t.Template!.IsActiveSchedule).ThenBy(t => t.Template.IsActiveTemplate);
 
             #region Так нельзя делать!!! Должно всегда сортироваться по NextRun и не важно какой тип у шаблона!!!
             // Сортируем сначала по StatusTypeId, т е те что used, будут первыми, потом сортируем по NextRun, чтобы ближайшие даты выполнились скорее