fix

Service/BudgetService.cs

@@ -243,7 +243,7 @@ public class BudgetService(
             var hasGlobalBudget = relevant.Any(b => b.SelectedCategories == null || b.SelectedCategories.Length == 0);
 
             var allClassifies = hasGlobalBudget
-                ? new List<string>()
+                ? []
                 : relevant
                     .SelectMany(b => b.SelectedCategories)
                     .Distinct()
@@ -602,6 +602,12 @@ public class BudgetService(
             return null;
         }
 
+        allBudgets = allBudgets
+        // 排序顺序 1.硬性预算 2.月度->年度 3.实际金额倒叙
+            .OrderBy(b => b.IsMandatoryExpense)
+            .ThenBy(b => b.Type)
+            .ThenByDescending(b => b.Limit);
+
         var date = referenceDate ?? DateTime.Now;
 
         decimal incomeLimitAtPeriod = 0;
@@ -724,12 +730,12 @@ public class BudgetService(
                 </thead>
             <tbody>
             """);
-            foreach (var item in noLimitIncomeItems)
+            foreach (var (Name, Amount) in noLimitIncomeItems)
             {
                 description.Append($"""
                 <tr>
-                    <td>{item.Name}</td>
-                    <td><span class='income-value'>{item.Amount:N0}</span></td>
+                    <td>{Name}</td>
+                    <td><span class='income-value'>{Amount:N0}</span></td>
                 </tr>
                 """);
             }
@@ -753,14 +759,14 @@ public class BudgetService(
                 </thead>
             <tbody>
             """);
-            foreach (var item in expenseItems)
+            foreach (var (Name, Limit, Factor, Total) in expenseItems)
             {
                 description.Append($"""
                 <tr>
-                    <td>{item.Name}</td>
-                    <td>{item.Limit:N0}</td>
-                    <td>{item.Factor:0.##}</td>
-                    <td><span class='expense-value'>{item.Total:N0}</span></td>
+                    <td>{Name}</td>
+                    <td>{Limit:N0}</td>
+                    <td>{Factor:0.##}</td>
+                    <td><span class='expense-value'>{Total:N0}</span></td>
                 </tr>
                 """);
             }
@@ -781,12 +787,12 @@ public class BudgetService(
                 </thead>
             <tbody>
             """);
-            foreach (var item in noLimitExpenseItems)
+            foreach (var (Name, Amount) in noLimitExpenseItems)
             {
                 description.Append($"""
                 <tr>
-                    <td>{item.Name}</td>
-                    <td><span class='expense-value'>{item.Amount:N0}</span></td>
+                    <td>{Name}</td>
+                    <td><span class='expense-value'>{Amount:N0}</span></td>
                 </tr>
                 """);
             }