From 16e610275255919dbc1ee84ee201260dd3862435 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Wed, 12 Feb 2025 18:17:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=BE=E7=A8=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=EF=BC=88=E5=BC=80=E7=8F=AD=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E8=B0=83=E7=94=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Api/Tiobon.Core.Model.xml         | 10 ++++
 .../Ghre/Ghre_CourseServices.cs               | 52 +++++++++++++++++++
 Tiobon.Core/Tiobon.Core.Model.xml             | 30 +++++++++++
 3 files changed, 92 insertions(+)

diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 282597a8..f207d8f1 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -5015,6 +5015,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.CourseId">
+            <summary>
+            课程ID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.CourseSceneId">
+            <summary>
+            课程场景ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttendBase">
             <summary>
             开班打卡 (Dto.Base)
diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
index d0093c00..972aefeb 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
@@ -271,6 +271,58 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
 
     }
 
+    public virtual async Task<Ghre_CourseDto> QueryById(object objId)
+    {
+        var data = await base.QueryById(objId);
+        var DT_TableDataT1 = Mapper.Map(data).ToANew<Ghre_CourseDto>();
+        string examPaperId = DT_TableDataT1.ExamPaperId;
+
+        var classsIds = new List<long>();
+
+        var courseClassIds = JsonConvert.DeserializeObject<List<long>>(DT_TableDataT1.CourseClassId);
+        classsIds = classsIds.Concat(courseClassIds).ToList();
+        classsIds = classsIds.Distinct().ToList();
+        var classs = await _ghre_CourseClassServices.Query(x => classsIds.Contains(x.Id));
+        var courseSceneIds = new List<long>();
+
+        courseSceneIds = courseSceneIds.Concat(JsonConvert.DeserializeObject<List<long>>(DT_TableDataT1.CourseSceneIds)).ToList();
+
+        courseSceneIds = courseSceneIds.Distinct().ToList();
+        var courseScenes = await Db.Queryable<Ghre_CourseScene>().Where(x => courseSceneIds.Contains(x.Id)).ToListAsync();
+
+        DT_TableDataT1.ChargeMethodLabel = await GetParaLabel("CourseChargeMethod", DT_TableDataT1.ChargeMethod);
+        DT_TableDataT1.InOrOutLabel = await GetParaLabel("CourseInOrOut", DT_TableDataT1.InOrOut);
+        DT_TableDataT1.IsOPenLabel = DT_TableDataT1.IsOpen == "1" ? "是" : "否";
+
+        var courseClass = classs.Where(a => DT_TableDataT1.CourseClassId.Contains(a.Id.ToString())).ToList();
+        DT_TableDataT1.CourseClassName = string.Join(",", courseClass.Select(a => a.ClassName + " (" + a.ClassNo + ")"));
+        if (DT_TableDataT1.CourseSceneIds.IsNotEmptyOrNull())
+        {
+            var courseScene = courseScenes.Where(a => DT_TableDataT1.CourseSceneIds.Contains(a.Id.ToString())).ToList();
+            DT_TableDataT1.CourseSceneName = string.Join(",", courseScene.Select(a => a.SceneName + " (" + a.SceneNo + ")"));
+        }
+
+        if (!string.IsNullOrWhiteSpace(examPaperId))
+            DT_TableDataT1.ExamPaperIds = JsonConvert.DeserializeObject<List<long>>(examPaperId);
+
+        string courseClassId = DT_TableDataT1.CourseClassId;
+        if (!string.IsNullOrWhiteSpace(courseClassId))
+            DT_TableDataT1.CourseClassIds = JsonConvert.DeserializeObject<List<long>>(courseClassId);
+
+        string courseSceneIds1 = DT_TableDataT1.CourseSceneIds;
+        if (!string.IsNullOrWhiteSpace(courseSceneIds1))
+            DT_TableDataT1.CourseSceneIds1 = JsonConvert.DeserializeObject<List<long>>(courseSceneIds1);
+
+        else DT_TableDataT1.ExamPaperIds = new List<long>();
+
+        DT_TableDataT1.IsOPenLabel = DT_TableDataT1.IsOpen == "1" ? "是" : "否";
+        if (DT_TableDataT1.ManagerId != null)
+            DT_TableDataT1.ManagerStaffName = (await Db.Queryable<Ghra_Staff>().Where(x => x.StaffID == DT_TableDataT1.ManagerId).FirstAsync())?.StaffName;
+        if (DT_TableDataT1.CourseWareId != null)
+            DT_TableDataT1.CourseWareName = (await Db.Queryable<Ghre_CourseWare>().Where(x => x.Id == DT_TableDataT1.CourseWareId).FirstAsync())?.CourseWareName;
+
+        return DT_TableDataT1;
+    }
 
     public async Task<ServiceResult> UpdateStatus(long[] ids, string status)
     {
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 6f93837d..f207d8f1 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -4900,11 +4900,26 @@
             学员群组ID
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.MessageTemplateId">
+            <summary>
+            开班通知模板ID
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.NoticeContent">
             <summary>
             开班通知内容
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.TeacherMessageTemplateId">
+            <summary>
+            讲师开班通知模板ID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.TeacherNoticeContent">
+            <summary>
+            讲师开班通知内容
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.Summary">
             <summary>
             总结
@@ -19641,11 +19656,26 @@
             学员群组ID
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.MessageTemplateId">
+            <summary>
+            开班通知模板ID
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.NoticeContent">
             <summary>
             开班通知内容
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.TeacherMessageTemplateId">
+            <summary>
+            讲师开班通知模板ID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.TeacherNoticeContent">
+            <summary>
+            讲师开班通知内容
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.Summary">
             <summary>
             总结