From da18ee99678eaf0716673d5c615ab71f9ae96c5d Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Mon, 31 Mar 2025 09:20:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=9B=E5=B0=BE=E5=9F=B9=E8=AE=AD=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=8A=A5=E8=A1=A8=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Services/CommonServices.cs | 14 +++++++-------
 Tiobon.Core/Tiobon.Core.Model.xml      |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs
index 488a3b0a..7a177704 100644
--- a/Tiobon.Core.Services/CommonServices.cs
+++ b/Tiobon.Core.Services/CommonServices.cs
@@ -2273,7 +2273,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 // 创建一个新的列表用于存储重新排序后的结果
                 reorderedNumbers = new();
 
-                sort = result.JM_TableColumnT1.TableColumn.Where(x => x.field == "M1").SingleOrDefault()?.SortNo ?? 5;
+                sort = result.JM_TableColumnT1.TableColumn.Where(x => x.field == "M1_Count").SingleOrDefault()?.SortNo ?? 5;
                 name1 = "计划年月";
                 result.JM_TableColumnT1.TableColumn?.ForEach(x =>
                 {
@@ -2282,7 +2282,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                     {
                         if (x.label.Contains(i.ObjToString()))
                         {
-                            if(x.label== $"实际合计人天{i}" || x.label == $"进展率{i}")
+                            if (x.label == $"实际合计人天{i}" || x.label == $"进展率{i}")
                             {
                                 x.label = x.label.Replace($"实际合计人天{i}", "实际合计人天");
                                 x.label = x.label.Replace($"进展率{i}", "进展率");
@@ -2310,15 +2310,15 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                     {
                         result.JM_TableColumnT1.TableColumn?.ForEach(x =>
                         {
-                            if (x.label.ObjToInt() == num)
-                            {
+                            if (x.label == "实际合计人天" && x.GroupName== num + "月")
                                 x.SortNo = sort;
-                                x.label = curentYear + "-" + x.label;
-                            }
+                            if (x.label == "进展率" && x.GroupName == num + "月")
+                                x.SortNo = sort + 1;
+
                         });
                         if (num == 12)
                             curentYear++;
-                        sort++;
+                        sort = sort + 2;
                     }
                 }
                 result.JM_TableColumnT1.TableColumn = result.JM_TableColumnT1.TableColumn.OrderBy(x => x.SortNo).ToList();
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index fd2ae5e8..e77f05f3 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -3120,6 +3120,11 @@
             默认封面图Name
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_CourseSceneBase.Courses">
+            <summary>
+            课程列表
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_CourseSnapBase">
             <summary>
             Ghre_CourseSnap (Dto.Base)