From d7eb8517f7c193f98179168f276038c4f463b9e2 Mon Sep 17 00:00:00 2001
From: MahanCh <www.mahan.13831012c@gmail.com>
Date: Mon, 26 May 2025 17:32:02 +0330
Subject: [PATCH] change sort

---
 .../AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs   | 1 +
 .../Repository/AdminMonthlyOverviewRepository.cs               | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs b/CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs
index c256fc09..28dcddba 100644
--- a/CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs
+++ b/CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs
@@ -67,6 +67,7 @@ public class AdminMonthlyOverviewListViewModel
     public long WorkshopId { get; set; }
     public string WorkshopName { get; set; }
     public string WorkshopArchiveCode { get; set; }
+    public int WorkshopArchiveCodeInt { get; set; }
     public string Province { get; set; }
     public string City { get; set; }
     public string Address { get; set; }
diff --git a/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs b/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs
index 7c1fda57..62e0544c 100644
--- a/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs
+++ b/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs
@@ -161,6 +161,7 @@ public class AdminMonthlyOverviewRepository : RepositoryBase<long, AdminMonthlyO
                 Id = x.id,
                 WorkshopName = workshop?.WorkshopFullName ?? "",
                 WorkshopArchiveCode = workshop?.ArchiveCode ?? "",
+                WorkshopArchiveCodeInt = Convert.ToInt32(workshop?.ArchiveCode ?? "0"),
                 Address = workshop?.Address ?? "",
                 City = workshop?.City ?? "",
                 Province = workshop?.State ?? "",
@@ -172,7 +173,7 @@ public class AdminMonthlyOverviewRepository : RepositoryBase<long, AdminMonthlyO
                 AgentPhoneNumber = "",
                 IsBlock = contractingParty?.IsBlock == "true"
             };
-        }).OrderBy(x => x.IsBlock).ToList();
+        }).OrderBy(x => x.IsBlock).ThenBy(x=>x.WorkshopArchiveCodeInt).ToList();
 
 
         return adminMonthlyOverviewList;