From b87d2ee9d8ff3bf63b16c34837d210f13fc1051b Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Thu, 13 Feb 2025 09:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=8F=AD=E7=AE=A1=E7=90=86=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=20=E8=80=83=E8=AF=95=E5=BC=80=E5=A7=8B=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=A5=E6=9C=9F=EF=BC=8C=E6=98=AF=E5=90=A6=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=AD=A6=E4=B9=A0=E6=89=8D=E8=83=BD=E8=80=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Api/Tiobon.Core.Model.xml         | 35 +++++++++++++++++++
 .../Base/Ghre/Ghre_OpenClass.Dto.Base.cs      | 19 ++++++++--
 .../Models/Ghre/Ghre_OpenClass.cs             | 19 ++++++++--
 .../View/Ghre/Ghre_OpenClass.Dto.View.cs      |  6 ++++
 .../Ghre/Ghre_OpenClassServices.cs            |  3 ++
 5 files changed, 78 insertions(+), 4 deletions(-)

diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index f207d8f1..f712c857 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -4875,6 +4875,16 @@
             报名结束日期
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ExamStartTime">
+            <summary>
+            考试开始日期
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ExamEndTime">
+            <summary>
+            考试结束日期
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.StudentCount">
             <summary>
             开班人数
@@ -4925,6 +4935,11 @@
             总结
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.IsRequireStudy">
+            <summary>
+            是否需要学习
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ReleaseStatus">
             <summary>
             发布状态
@@ -19631,6 +19646,16 @@
             报名结束日期
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ExamStartTime">
+            <summary>
+            考试开始日期
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ExamEndTime">
+            <summary>
+            考试结束日期
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.StudentCount">
             <summary>
             开班人数
@@ -19681,6 +19706,11 @@
             总结
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.IsRequireStudy">
+            <summary>
+            是否需要学习
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ReleaseStatus">
             <summary>
             发布状态
@@ -29857,6 +29887,11 @@
             报名起止日期
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.ExamStartEndTime">
+            <summary>
+            考试起止日期
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.ExamPaperName">
             <summary>
             试卷
diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs
index dd52a133..6a79c253 100644
--- a/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs
@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/2/12 15:58:56  SimonHsiao   初版
+*V0.01  2025/2/13 9:25:21  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -81,7 +81,7 @@ public class Ghre_OpenClassBase
     /// <summary>
     /// 讲师ID
     /// </summary>
-    public int? TeacherId { get; set; }
+    public long? TeacherId { get; set; }
 
     /// <summary>
     /// 培训地点
@@ -109,6 +109,16 @@ public class Ghre_OpenClassBase
     /// </summary>
     public DateTime? RegisterEndTime { get; set; }
 
+    /// <summary>
+    /// 考试开始日期
+    /// </summary>
+    public DateTime? ExamStartTime { get; set; }
+
+    /// <summary>
+    /// 考试结束日期
+    /// </summary>
+    public DateTime? ExamEndTime { get; set; }
+
     /// <summary>
     /// 开班人数
     /// </summary>
@@ -164,6 +174,11 @@ public class Ghre_OpenClassBase
     [Display(Name = "Summary"), Description("总结"), MaxLength(2000, ErrorMessage = "总结 不能超过 2000 个字符")]
     public string Summary { get; set; }
 
+    /// <summary>
+    /// 是否需要学习
+    /// </summary>
+    public bool? IsRequireStudy { get; set; }
+
     /// <summary>
     /// 发布状态
     /// </summary>
diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs
index e2240b9a..adde5f72 100644
--- a/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs
+++ b/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs
@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/2/12 15:58:56  SimonHsiao   初版
+*V0.01  2025/2/13 9:25:21  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -82,7 +82,7 @@ public class Ghre_OpenClass : BasePoco
     /// <summary>
     /// 讲师ID
     /// </summary>
-    public int? TeacherId { get; set; }
+    public long? TeacherId { get; set; }
 
     /// <summary>
     /// 培训地点
@@ -110,6 +110,16 @@ public class Ghre_OpenClass : BasePoco
     /// </summary>
     public DateTime? RegisterEndTime { get; set; }
 
+    /// <summary>
+    /// 考试开始日期
+    /// </summary>
+    public DateTime? ExamStartTime { get; set; }
+
+    /// <summary>
+    /// 考试结束日期
+    /// </summary>
+    public DateTime? ExamEndTime { get; set; }
+
     /// <summary>
     /// 开班人数
     /// </summary>
@@ -165,6 +175,11 @@ public class Ghre_OpenClass : BasePoco
     [Display(Name = "Summary"), Description("总结"), MaxLength(2000, ErrorMessage = "总结 不能超过 2000 个字符")]
     public string Summary { get; set; }
 
+    /// <summary>
+    /// 是否需要学习
+    /// </summary>
+    public bool? IsRequireStudy { get; set; }
+
     /// <summary>
     /// 发布状态
     /// </summary>
diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClass.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClass.Dto.View.cs
index 9cc2275e..cb09fbbb 100644
--- a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClass.Dto.View.cs
+++ b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClass.Dto.View.cs
@@ -48,10 +48,16 @@ public class Ghre_OpenClassDto : Ghre_OpenClass
     /// </summary>
     public string RegisterStartEndTime { get; set; }
 
+    /// <summary>
+    /// 考试起止日期
+    /// </summary>
+    public string ExamStartEndTime { get; set; }
+
     /// <summary>
     /// 试卷
     /// </summary>
     public string ExamPaperName { get; set; }
+    
 
     /// <summary>
     /// 开班负责人
diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
index 47403812..459028ef 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
@@ -66,6 +66,9 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
 
             if (DT_TableDataT1.RegisterStartTime != null && DT_TableDataT1.RegisterEndTime != null)
                 DT_TableDataT1.RegisterStartEndTime = $"{DateTimeHelper.ConvertToMiniuteString(DT_TableDataT1.RegisterStartTime)}~{DateTimeHelper.ConvertToMiniuteString(DT_TableDataT1.RegisterEndTime)}";
+            
+            if (DT_TableDataT1.ExamStartTime != null && DT_TableDataT1.ExamEndTime != null)
+                DT_TableDataT1.ExamStartEndTime = $"{DateTimeHelper.ConvertToMiniuteString(DT_TableDataT1.ExamStartTime)}~{DateTimeHelper.ConvertToMiniuteString(DT_TableDataT1.ExamEndTime)}";
 
             if (DT_TableDataT1.ExamPaperId != null)
                 DT_TableDataT1.ExamPaperName = (await Db.Queryable<Ghre_ExamPaper>().FirstAsync(x => x.Id == DT_TableDataT1.ExamPaperId))?.PaperName;