优化

Tiobon.Core.Api/Tiobon.Core.Model.xml

@@ -3460,6 +3460,11 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_CourseWareAttachmentBase.SortNo">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_CreditPointBase">
             <summary>
             学分记录 (Dto.Base)
@@ -17131,6 +17136,11 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_CourseWareAttachment.SortNo">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_CreditPoint">
             <summary>
             学分记录 (Model)

Tiobon.Core.Api/appsettings.json

@@ -107,8 +107,8 @@
       "ConnId": "WMTiobon_MSSQL_Main",
       "DBType": 1,
       "Enabled": true,
-      "Connection": "Data Source=47.99.54.186;User ID=GHR;Password=Tiobon20190101;Database=GHR30;Encrypt=True;TrustServerCertificate=True;",
+      "Connection1": "Data Source=47.99.54.186;User ID=GHR;Password=Tiobon20190101;Database=GHR30;Encrypt=True;TrustServerCertificate=True;",
-      "Connection1": "Data Source=47.99.54.186;User ID=GHR;Password=Tiobon20190101;Database=GHR5_TY;Encrypt=True;TrustServerCertificate=True;",
+      "Connection": "Data Source=47.99.54.186;User ID=GHR;Password=Tiobon20190101;Database=GHR5_TY;Encrypt=True;TrustServerCertificate=True;",
       "ProviderName": "System.Data.SqlClient"
     },
     {

Tiobon.Core.Model/Base/Ghre/Ghre_CourseWareAttachment.Dto.Base.cs

@@ -6,17 +6,14 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/5/27 16:55:23  SimonHsiao   初版
+*V0.01  2025/1/14 15:35:05  SimonHsiao   初版
 *
-* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
+* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
 *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
 */
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
 namespace Tiobon.Core.Model.Models
 {
 
@@ -139,5 +136,10 @@ namespace Tiobon.Core.Model.Models
         /// 预留字段12
         /// </summary>
         public int? ReverseI2 { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int? SortNo { get; set; }
     }
 }

Tiobon.Core.Model/Models/Ghre/Ghre_CourseWareAttachment.cs

@@ -6,9 +6,9 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/5/27 16:55:23  SimonHsiao   初版
+*V0.01  2025/1/14 15:35:05  SimonHsiao   初版
 *
-* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
+* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
 *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
 *│　作者：SimonHsiao                                                  │
@@ -38,7 +38,7 @@ namespace Tiobon.Core.Model.Models
         /// <summary>
         /// 扩展名
         /// </summary>
-        [Display(Name = "AttachFileExtension"), Description("扩展名"), MaxLength(32, ErrorMessage = "扩展名 不能超过 32 个字符")]
+        [Display(Name = "AttachFileExtension"), Description("扩展名"), MaxLength(256, ErrorMessage = "扩展名 不能超过 256 个字符")]
         public string AttachFileExtension { get; set; }
 
         /// <summary>
@@ -137,5 +137,10 @@ namespace Tiobon.Core.Model.Models
         /// 预留字段12
         /// </summary>
         public int? ReverseI2 { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int? SortNo { get; set; }
     }
 }

Tiobon.Core.Services/Ghre/Ghre_CourseWareServices.cs

@@ -105,7 +105,7 @@ public class Ghre_CourseWareServices : BaseServices<Ghre_CourseWare, Ghre_Course
 
         var attachments = await _ghre_CourseWareAttachmentServices.Query(x => x.CourseWareId == body.id);
 
-        result.result.DT_TableDataT1[0].Attachments = attachments.Where(x => x.AttachFileExtension != "http").ToList();
+        result.result.DT_TableDataT1[0].Attachments = attachments.OrderBy(x => x.SortNo).Where(x => x.AttachFileExtension != "http").ToList();
         if (result.result.DT_TableDataT1[0].Attachments.Any())
         {
             result.result.DT_TableDataT1[0].Attachments.ForEach(x => x.RelativePath = "/Advanced" + x.RelativePath);
@@ -179,7 +179,7 @@ public class Ghre_CourseWareServices : BaseServices<Ghre_CourseWare, Ghre_Course
 
             x.StudyDuration = $"{x.Hours}小时{x.Minutes}分钟";
             x.SourceLabel = await GetParaLabel("CourseWareSource", x.Source);
-            x.Attachments = attachments.Where(a => a.CourseWareId == x.Id && a.AttachFileExtension != "http").ToList();
+            x.Attachments = attachments.Where(a => a.CourseWareId == x.Id && a.AttachFileExtension != "http").OrderBy(x => x.SortNo).ToList();
             x.Links = attachments.Where(x => x.AttachFileExtension == "http")
             .Select(x => new Ghre_CourseWareLink()
             {

Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs

@@ -1234,7 +1234,7 @@ WHERE A.Id  = '{id}'";
         for (int j = 0; j < course.CourseWareList.Count; j++)
         {
             var attachments = await Db.Queryable<Ghre_CourseWareAttachment>().Where(x => x.CourseWareId == course.CourseWareList[j].Id).ToListAsync();
-            course.CourseWareList[j].Attachments = attachments.Where(x => x.AttachFileExtension != "http").ToList();
+            course.CourseWareList[j].Attachments = attachments.Where(x => x.AttachFileExtension != "http").OrderBy(x => x.SortNo).ToList();
             if (course.CourseWareList[j].Attachments != null && course.CourseWareList[j].Attachments.Any())
                 course.CourseWareList[j].Attachments.ForEach(x => x.RelativePath = "/Advanced" + x.RelativePath);
 

Tiobon.Core/Tiobon.Core.Model.xml

@@ -3460,6 +3460,11 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_CourseWareAttachmentBase.SortNo">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_CreditPointBase">
             <summary>
             学分记录 (Dto.Base)
@@ -17131,6 +17136,11 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_CourseWareAttachment.SortNo">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_CreditPoint">
             <summary>
             学分记录 (Model)