From b1d2ff941a38b2436d4cd82d039f975385dc6e10 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Wed, 24 Jul 2024 14:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Api/Tiobon.Core.Model.xml         | 48 +++++++++++++++++--
 .../Base/Ghre/Ghre_StudyRecord.Dto.Base.cs    | 29 +++++++++--
 .../Models/Ghre/Ghre_StudyRecord.cs           | 29 +++++++++--
 Tiobon.Core/Tiobon.Core.Model.xml             | 48 +++++++++++++++++--
 4 files changed, 140 insertions(+), 14 deletions(-)

diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 76e11b67..73679577 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -3690,9 +3690,14 @@
             加入时间
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.DeadlineTime">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.CourseBeginTime">
             <summary>
-            截止时间
+            课程结束时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.CourseEndTime">
+            <summary>
+            课程结束时间
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.BeginTime">
@@ -3710,6 +3715,21 @@
             学习进度
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.CourseType">
+            <summary>
+            课程类型
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.CourseStatus">
+            <summary>
+            课程状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.StudyStatus">
+            <summary>
+            学习状态
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.RemarkSz">
             <summary>
             备注
@@ -9056,9 +9076,14 @@
             加入时间
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.DeadlineTime">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.CourseBeginTime">
             <summary>
-            截止时间
+            课程结束时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.CourseEndTime">
+            <summary>
+            课程结束时间
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.BeginTime">
@@ -9076,6 +9101,21 @@
             学习进度
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.CourseType">
+            <summary>
+            课程类型
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.CourseStatus">
+            <summary>
+            课程状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.StudyStatus">
+            <summary>
+            学习状态
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.RemarkSz">
             <summary>
             备注
diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs
index 0faec282..22fa8a3b 100644
--- a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs
@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/7/18 10:47:16  SimonHsiao   初版
+*V0.01  2024/7/24 14:49:40  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -52,9 +52,14 @@ namespace Tiobon.Core.Model.Models
         public DateTime? JoinTime { get; set; }
 
         /// <summary>
-        /// 截止时间
+        /// 课程结束时间
         /// </summary>
-        public DateTime? DeadlineTime { get; set; }
+        public DateTime? CourseBeginTime { get; set; }
+
+        /// <summary>
+        /// 课程结束时间
+        /// </summary>
+        public DateTime? CourseEndTime { get; set; }
 
         /// <summary>
         /// 开始时间
@@ -71,6 +76,24 @@ namespace Tiobon.Core.Model.Models
         /// </summary>
         public int? StudyProgress { get; set; }
 
+        /// <summary>
+        /// 课程类型
+        /// </summary>
+        [Display(Name = "CourseType"), Description("课程类型"), MaxLength(32, ErrorMessage = "课程类型 不能超过 32 个字符")]
+        public string CourseType { get; set; }
+
+        /// <summary>
+        /// 课程状态
+        /// </summary>
+        [Display(Name = "CourseStatus"), Description("课程状态"), MaxLength(32, ErrorMessage = "课程状态 不能超过 32 个字符")]
+        public string CourseStatus { get; set; }
+
+        /// <summary>
+        /// 学习状态
+        /// </summary>
+        [Display(Name = "StudyStatus"), Description("学习状态"), MaxLength(32, ErrorMessage = "学习状态 不能超过 32 个字符")]
+        public string StudyStatus { get; set; }
+
         /// <summary>
         /// 备注
         /// </summary>
diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs
index 15af8422..36e3ef7c 100644
--- a/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs
+++ b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs
@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/7/18 10:47:16  SimonHsiao   初版
+*V0.01  2024/7/24 14:49:40  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -54,9 +54,14 @@ namespace Tiobon.Core.Model.Models
         public DateTime? JoinTime { get; set; }
 
         /// <summary>
-        /// 截止时间
+        /// 课程结束时间
         /// </summary>
-        public DateTime? DeadlineTime { get; set; }
+        public DateTime? CourseBeginTime { get; set; }
+
+        /// <summary>
+        /// 课程结束时间
+        /// </summary>
+        public DateTime? CourseEndTime { get; set; }
 
         /// <summary>
         /// 开始时间
@@ -73,6 +78,24 @@ namespace Tiobon.Core.Model.Models
         /// </summary>
         public int? StudyProgress { get; set; }
 
+        /// <summary>
+        /// 课程类型
+        /// </summary>
+        [Display(Name = "CourseType"), Description("课程类型"), MaxLength(32, ErrorMessage = "课程类型 不能超过 32 个字符")]
+        public string CourseType { get; set; }
+
+        /// <summary>
+        /// 课程状态
+        /// </summary>
+        [Display(Name = "CourseStatus"), Description("课程状态"), MaxLength(32, ErrorMessage = "课程状态 不能超过 32 个字符")]
+        public string CourseStatus { get; set; }
+
+        /// <summary>
+        /// 学习状态
+        /// </summary>
+        [Display(Name = "StudyStatus"), Description("学习状态"), MaxLength(32, ErrorMessage = "学习状态 不能超过 32 个字符")]
+        public string StudyStatus { get; set; }
+
         /// <summary>
         /// 备注
         /// </summary>
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 76e11b67..73679577 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -3690,9 +3690,14 @@
             加入时间
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.DeadlineTime">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.CourseBeginTime">
             <summary>
-            截止时间
+            课程结束时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.CourseEndTime">
+            <summary>
+            课程结束时间
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.BeginTime">
@@ -3710,6 +3715,21 @@
             学习进度
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.CourseType">
+            <summary>
+            课程类型
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.CourseStatus">
+            <summary>
+            课程状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.StudyStatus">
+            <summary>
+            学习状态
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.RemarkSz">
             <summary>
             备注
@@ -9056,9 +9076,14 @@
             加入时间
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.DeadlineTime">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.CourseBeginTime">
             <summary>
-            截止时间
+            课程结束时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.CourseEndTime">
+            <summary>
+            课程结束时间
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.BeginTime">
@@ -9076,6 +9101,21 @@
             学习进度
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.CourseType">
+            <summary>
+            课程类型
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.CourseStatus">
+            <summary>
+            课程状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.StudyStatus">
+            <summary>
+            学习状态
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.RemarkSz">
             <summary>
             备注