开班

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

@@ -5350,16 +5350,6 @@
             预留字段12
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassScheduleBase.Schedules">
-            <summary>
-            开班课表
-            </summary>
-        </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassScheduleBase.Attachments">
-            <summary>
-            开班课表
-            </summary>
-        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassScoresBase">
             <summary>
             开班成绩 (Dto.Base)
@@ -30042,6 +30032,11 @@
             修改信息
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassScheduleDto.CourseName">
+            <summary>
+            课程名称
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassScoresDto">
             <summary>
             开班成绩(Dto.View1)

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

@@ -136,15 +136,4 @@ public class Ghre_OpenClassScheduleBase
     public int? ReverseI2 { get; set; }
 
     public List<DateTime> StartEndTime { get; set; } = new List<DateTime>();
-
-
-    /// <summary>
-    /// 开班课表
-    /// </summary>
-    public List<InsertGhre_OpenClassScheduleInput> Schedules { get; set; } = new List<InsertGhre_OpenClassScheduleInput>();
-
-    /// <summary>
-    /// 开班课表
-    /// </summary>
-    public List<Ghre_Attachment> Attachments { get; set; } = new List<Ghre_Attachment>();
 }

Tiobon.Core.Model/View/Ghre/Ghre_OpenClassSchedule.Dto.View.cs

@@ -31,4 +31,11 @@ public class Ghre_OpenClassScheduleDto : Ghre_OpenClassSchedule
     /// 修改信息
     /// </summary>
     public string UpdateDataInfo { get; set; }
+
+    /// <summary>
+    /// 课程名称
+    /// </summary>
+    public string CourseName { get; set; }
+
+    public List<DateTime?> StartEndTime { get; set; } = new List<DateTime?>();
 }

Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs

@@ -1,4 +1,7 @@
-namespace Tiobon.Core.Services;
+using MySqlX.XDevAPI.Common;
+using Tiobon.Core.IServices;
+
+namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 开班课表 (服务)
@@ -12,4 +15,20 @@ public class Ghre_OpenClassScheduleServices : BaseServices<Ghre_OpenClassSchedul
         base.BaseDal = dal;
         base._caching = caching;
     }
+
+
+
+    public override async Task<List<Ghre_OpenClassScheduleDto>> QueryDto(Expression<Func<Ghre_OpenClassSchedule, bool>> whereExpression)
+    {
+        var data = await base.QueryDto(whereExpression);
+        var courseIds = data.Select(x => x.CourseId).Distinct().ToList();
+        var courses = await Db.Queryable<Ghre_Course>().Where(x => courseIds.Contains(x.Id)).ToListAsync();
+        data.ForEach(x =>
+        {
+            x.CourseName = courses.Where(o => x.CourseId == o.Id).FirstOrDefault()?.CourseName;
+            x.StartEndTime.Add(x.StartTime);
+            x.StartEndTime.Add(x.EndTime);
+        });
+        return data;
+    }
 } 

Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs

@@ -207,6 +207,7 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
             result.result.DT_TableDataT1[0].ExamStartEndTime.Add(result.result.DT_TableDataT1[0].ExamStartTime);
             result.result.DT_TableDataT1[0].ExamStartEndTime.Add(result.result.DT_TableDataT1[0].ExamEndTime);
             result.result.DT_TableDataT1[0].Schedules = await _ghre_OpenClassScheduleServices.QueryDto(x => x.OpenClassId == body.id);
+
             result.result.DT_TableDataT1[0].Attachments = await Db.Queryable<Ghre_Attachment>().Where(x => x.TableName == body.id.ObjToString() && x.AttachmentGroupID == 1).ToListAsync();
         }
         return result;

Tiobon.Core/Tiobon.Core.Model.xml

@@ -3670,14 +3670,14 @@
             关联类型
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.CourseSceneId">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.CourseId">
             <summary>
-            课程场景ID
+            课程ID
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.CourseId">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.CourseSceneId">
             <summary>
-            课程ID
+            课程快照ID
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.ExamPaperId">
@@ -3725,6 +3725,11 @@
             考试形式
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.ExamPlace">
+            <summary>
+            线下考试地点
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.IsLinkOpenClass">
             <summary>
             是否关联开班
@@ -3740,11 +3745,6 @@
             状态
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.ExamPlace">
-            <summary>
-            线下考试地点
-            </summary>
-        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.RemarkSz">
             <summary>
             备注
@@ -3825,6 +3825,11 @@
             默认封面图Name
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.Source">
+            <summary>
+            来源，手动维护、开班
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_ExamMessageLogBase">
             <summary>
             考试通知记录 (Dto.Base)
@@ -4955,6 +4960,11 @@
             结案状态
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ExamId">
+            <summary>
+            考试ID
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.Status">
             <summary>
             状态
@@ -5340,16 +5350,6 @@
             预留字段12
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassScheduleBase.Schedules">
-            <summary>
-            开班课表
-            </summary>
-        </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassScheduleBase.Attachments">
-            <summary>
-            开班课表
-            </summary>
-        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassScoresBase">
             <summary>
             开班成绩 (Dto.Base)
@@ -18476,14 +18476,14 @@
             关联类型
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_Exam.CourseSceneId">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Exam.CourseId">
             <summary>
-            课程场景ID
+            课程ID
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_Exam.CourseId">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Exam.CourseSceneId">
             <summary>
-            课程ID
+            课程快照ID
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Exam.ExamPaperId">
@@ -18531,6 +18531,11 @@
             考试形式
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Exam.ExamPlace">
+            <summary>
+            线下考试地点
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Exam.IsLinkOpenClass">
             <summary>
             是否关联开班
@@ -18546,11 +18551,6 @@
             状态
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_Exam.ExamPlace">
-            <summary>
-            线下考试地点
-            </summary>
-        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Exam.RemarkSz">
             <summary>
             备注
@@ -18631,6 +18631,11 @@
             默认封面图Name
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Exam.Source">
+            <summary>
+            来源，手动维护、开班
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_ExamMessageLog">
             <summary>
             考试通知记录 (Model)
@@ -19761,6 +19766,11 @@
             结案状态
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ExamId">
+            <summary>
+            考试ID
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.Status">
             <summary>
             状态
@@ -30022,6 +30032,11 @@
             修改信息
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassScheduleDto.CourseName">
+            <summary>
+            课程名称
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassScoresDto">
             <summary>
             开班成绩(Dto.View1)