From c414e5f00c5365804db87f1cb26461aa6281daeb Mon Sep 17 00:00:00 2001 From: Professional Date: Wed, 19 Mar 2025 23:11:40 +0700 Subject: [PATCH] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D1=80=D0=B0=D0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Program.cs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Program.cs b/Program.cs index bdc47c6..1429438 100644 --- a/Program.cs +++ b/Program.cs @@ -580,10 +580,11 @@ class Program } // Сортируем заявки по приоритету - var sortedReports = reports.OrderByDescending(r => r.Priority == "высокий") - .ThenByDescending(r => r.Priority == "средний") - .ThenByDescending(r => r.Priority == "низкий") - .ToList(); + var highPriorityReports = reports.Where(r => r.Priority.ToLower() == "высокий").ToList(); + var mediumPriorityReports = reports.Where(r => r.Priority.ToLower() == "средний").ToList(); + var lowPriorityReports = reports.Where(r => r.Priority.ToLower() == "низкий").ToList(); + + var sortedReports = highPriorityReports.Concat(mediumPriorityReports).Concat(lowPriorityReports).ToList(); var buttons = new List(); @@ -627,6 +628,7 @@ class Program + private static async Task ViewArchivedReports(ITelegramBotClient botClient, long chatId) { string connectionString = "Data Source=bot.db"; @@ -655,10 +657,11 @@ class Program } // Сортируем заявки по приоритету - var sortedReports = reports.OrderByDescending(r => r.Priority == "высокий") - .ThenByDescending(r => r.Priority == "средний") - .ThenByDescending(r => r.Priority == "низкий") - .ToList(); + var highPriorityReports = reports.Where(r => r.Priority.ToLower() == "высокий").ToList(); + var mediumPriorityReports = reports.Where(r => r.Priority.ToLower() == "средний").ToList(); + var lowPriorityReports = reports.Where(r => r.Priority.ToLower() == "низкий").ToList(); + + var sortedReports = highPriorityReports.Concat(mediumPriorityReports).Concat(lowPriorityReports).ToList(); var buttons = new List(); @@ -701,6 +704,7 @@ class Program + private static async Task ShowReportDetails(ITelegramBotClient botClient, long chatId, long reportId, int messageId) { try