diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 68c6702b..91779e8e 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -6135,6 +6135,16 @@
查看答案和解析后，是否允许重新考试
+
+
+ 讲师上级ID
+
+
+
+
+ 上级反馈单ID
+
+
课程ID
@@ -24777,6 +24787,16 @@
查看答案和解析后，是否允许重新考试
+
+
+ 讲师上级ID
+
+
+
+
+ 上级反馈单ID
+
+
开班打卡 (Model)
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 e7ce7aa4..dbd0fe3e 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/4/1 15:31:14 SimonHsiao 初版
+*V0.01 2025/5/6 11:16:14 SimonHsiao 初版
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@@ -318,6 +318,17 @@ public class Ghre_OpenClassBase
///
public bool? IsAfterViewResultRetake { get; set; }
+ ///
+ /// 讲师上级ID
+ ///
+ public long? ParentTeacherId { get; set; }
+
+ ///
+ /// 上级反馈单ID
+ ///
+ public int? ParentFeedbackIdbig { get; set; }
+
+
///
/// 课程ID
diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs
index 71bdeee1..51ccccdd 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/4/1 15:31:14 SimonHsiao 初版
+*V0.01 2025/5/6 11:16:14 SimonHsiao 初版
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@@ -318,4 +318,14 @@ public class Ghre_OpenClass : BasePoco
/// 查看答案和解析后，是否允许重新考试
///
public bool? IsAfterViewResultRetake { get; set; }
+
+ ///
+ /// 讲师上级ID
+ ///
+ public long? ParentTeacherId { get; set; }
+
+ ///
+ /// 上级反馈单ID
+ ///
+ public int? ParentFeedbackIdbig { get; set; }
}
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
index b32cac47..ca212c58 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
@@ -1135,13 +1135,13 @@ public class Ghre_ExamServices : BaseServices
{
if (x.DataSource.IsNull())
- x.DataSource = DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED;
+ x.DataSource = DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED;
- if (x.DataSource == DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED)
+ if (x.DataSource == DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED)
x.DataSourceLabel = "手动必修";
- else if (x.DataSource == DIC_EXAM_STAFF_SOURCE.STUDY_RULE_REQUIRED)
+ else if (x.DataSource == DIC_EXAM_STAFF_SOURCE.STUDY_RULE_REQUIRED)
x.DataSourceLabel = "必修规则";
- else if (x.DataSource == DIC_EXAM_STAFF_SOURCE.MANUAL_ELECTIVE)
+ else if (x.DataSource == DIC_EXAM_STAFF_SOURCE.MANUAL_ELECTIVE)
x.DataSourceLabel = "手动选修";
});
@@ -1460,7 +1460,9 @@ public class Ghre_ExamServices : BaseServices()
.WhereIF(!entity.CourseId.IsNull(), x => x.CourseId == entity.CourseId)
.WhereIF(!entity.CourseSceneId.IsNull(), x => x.CourseSceneId == entity.CourseSceneId)
- .Where(x => x.ExamId == id && x.StaffId == staff.StaffId).AnyAsync();
+ //.Where(x => (x.CourseBeginTime <= courseTime.Date && x.CourseEndTime >= courseTime.Date) ||
+ //(x.CourseBeginTime <= courseEndTime && x.CourseEndTime >= courseEndTime))
+ .Where(x => x.ExamId == id && x.StaffId == staff.StaffId && x.CourseType != "ExcelImport").AnyAsync();
if (!exist)
inserts.Add(new Ghre_StudyRecord()
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 68c6702b..91779e8e 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -6135,6 +6135,16 @@
查看答案和解析后，是否允许重新考试
+
+
+ 讲师上级ID
+
+
+
+
+ 上级反馈单ID
+
+
课程ID
@@ -24777,6 +24787,16 @@
查看答案和解析后，是否允许重新考试
+
+
+ 讲师上级ID
+
+
+
+
+ 上级反馈单ID
+
+
开班打卡 (Model)
diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml
index 752767ce..5b627a90 100644
--- a/Tiobon.Core/Tiobon.Core.xml
+++ b/Tiobon.Core/Tiobon.Core.xml
@@ -796,11 +796,25 @@
+
+
+ 统计
+
+
+
+
课程场景(Controller)
+
+
+ 统计
+
+
+
+
Ghre_CourseSnap(Controller)