Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

开班维护页新增上级讲师ID、上级反馈单Id维护

Browse Source
master
xiaochanghai 2 months ago
parent 7c340bd5c7
commit 928a2e3d64
6 changed files with 84 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 13
      Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs
  3. 12
      Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs
  4. 12
      Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
  5. 20
      Tiobon.Core/Tiobon.Core.Model.xml
  6. 14
      Tiobon.Core/Tiobon.Core.xml

20
Tiobon.Core.Api/Tiobon.Core.Model.xml
Unescape View File

@ -6135,6 +6135,16 @@
查看答案和解析后，是否允许重新考试
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentTeacherId">
<summary>
讲师上级ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentFeedbackIdbig">
<summary>
上级反馈单ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.CourseId">
<summary>
课程ID
@ -24777,6 +24787,16 @@
查看答案和解析后，是否允许重新考试
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentTeacherId">
<summary>
讲师上级ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentFeedbackIdbig">
<summary>
上级反馈单ID
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttend">
<summary>
开班打卡 (Model)

13
Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs
Unescape View File

@ -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
/// </summary>
public bool? IsAfterViewResultRetake { get; set; }
/// <summary>
/// 讲师上级ID
/// </summary>
public long? ParentTeacherId { get; set; }
/// <summary>
/// 上级反馈单ID
/// </summary>
public int? ParentFeedbackIdbig { get; set; }
/// <summary>
/// 课程ID

12
Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs
Unescape View File

@ -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
/// 查看答案和解析后，是否允许重新考试
/// </summary>
public bool? IsAfterViewResultRetake { get; set; }
/// <summary>
/// 讲师上级ID
/// </summary>
public long? ParentTeacherId { get; set; }
/// <summary>
/// 上级反馈单ID
/// </summary>
public int? ParentFeedbackIdbig { get; set; }
}

12
Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
Unescape View File

@ -1135,13 +1135,13 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
data.ForEach(x =>
{
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<Ghre_Exam, Ghre_ExamDto, InsertGhr
var exist = await Db.Queryable<Ghre_StudyRecord>()
.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()

20
Tiobon.Core/Tiobon.Core.Model.xml
Unescape View File

@ -6135,6 +6135,16 @@
查看答案和解析后，是否允许重新考试
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentTeacherId">
<summary>
讲师上级ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentFeedbackIdbig">
<summary>
上级反馈单ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.CourseId">
<summary>
课程ID
@ -24777,6 +24787,16 @@
查看答案和解析后，是否允许重新考试
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentTeacherId">
<summary>
讲师上级ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentFeedbackIdbig">
<summary>
上级反馈单ID
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttend">
<summary>
开班打卡 (Model)

14
Tiobon.Core/Tiobon.Core.xml
Unescape View File

@ -796,11 +796,25 @@
<param name="KeyWords"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_CourseController.QueryStatistic(System.Int64)">
<summary>
统计
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_CourseSceneController">
<summary>
课程场景(Controller)
</summary>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_CourseSceneController.QueryStatistic(System.Int64)">
<summary>
统计
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_CourseSnapController">
<summary>
Ghre_CourseSnap(Controller)

Write Preview
Loading…
Cancel
Save