diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 356d673a..b071a93f 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -5350,16 +5350,6 @@
预留字段12
-
-
- 开班课表
-
-
-
-
- 开班课表
-
-
开班成绩 (Dto.Base)
@@ -30042,6 +30032,11 @@
修改信息
+
+
+ 课程名称
+
+
开班成绩(Dto.View1)
diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClassSchedule.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClassSchedule.Dto.Base.cs
index 28d4a27f..f2b49e5d 100644
--- a/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClassSchedule.Dto.Base.cs
+++ b/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 StartEndTime { get; set; } = new List();
-
-
- ///
- /// 开班课表
- ///
- public List Schedules { get; set; } = new List();
-
- ///
- /// 开班课表
- ///
- public List Attachments { get; set; } = new List();
}
diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassSchedule.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassSchedule.Dto.View.cs
index 851c13e9..bbabee3a 100644
--- a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassSchedule.Dto.View.cs
+++ b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassSchedule.Dto.View.cs
@@ -31,4 +31,11 @@ public class Ghre_OpenClassScheduleDto : Ghre_OpenClassSchedule
/// 修改信息
///
public string UpdateDataInfo { get; set; }
+
+ ///
+ /// 课程名称
+ ///
+ public string CourseName { get; set; }
+
+ public List StartEndTime { get; set; } = new List();
}
diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs
index f143137b..03727534 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs
+++ b/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;
///
/// 开班课表 (服务)
@@ -12,4 +15,20 @@ public class Ghre_OpenClassScheduleServices : BaseServices> QueryDto(Expression> whereExpression)
+ {
+ var data = await base.QueryDto(whereExpression);
+ var courseIds = data.Select(x => x.CourseId).Distinct().ToList();
+ var courses = await Db.Queryable().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;
+ }
+}
\ No newline at end of file
diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
index 6ec20902..fe8005e8 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
@@ -207,6 +207,7 @@ public class Ghre_OpenClassServices : BaseServices x.OpenClassId == body.id);
+
result.result.DT_TableDataT1[0].Attachments = await Db.Queryable().Where(x => x.TableName == body.id.ObjToString() && x.AttachmentGroupID == 1).ToListAsync();
}
return result;
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 989b50fc..b071a93f 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -3670,14 +3670,14 @@
关联类型
-
+
- 课程场景ID
+ 课程ID
-
+
- 课程ID
+ 课程快照ID
@@ -3725,6 +3725,11 @@
考试形式
+
+
+ 线下考试地点
+
+
是否关联开班
@@ -3740,11 +3745,6 @@
状态
-
-
- 线下考试地点
-
-
备注
@@ -3825,6 +3825,11 @@
默认封面图Name
+
+
+ 来源，手动维护、开班
+
+
考试通知记录 (Dto.Base)
@@ -4955,6 +4960,11 @@
结案状态
+
+
+ 考试ID
+
+
状态
@@ -5340,16 +5350,6 @@
预留字段12
-
-
- 开班课表
-
-
-
-
- 开班课表
-
-
开班成绩 (Dto.Base)
@@ -18476,14 +18476,14 @@
关联类型
-
+
- 课程场景ID
+ 课程ID
-
+
- 课程ID
+ 课程快照ID
@@ -18531,6 +18531,11 @@
考试形式
+
+
+ 线下考试地点
+
+
是否关联开班
@@ -18546,11 +18551,6 @@
状态
-
-
- 线下考试地点
-
-
备注
@@ -18631,6 +18631,11 @@
默认封面图Name
+
+
+ 来源，手动维护、开班
+
+
考试通知记录 (Model)
@@ -19761,6 +19766,11 @@
结案状态
+
+
+ 考试ID
+
+
状态
@@ -30022,6 +30032,11 @@
修改信息
+
+
+ 课程名称
+
+
开班成绩(Dto.View1)