diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 69c67241..e58e0e66 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -6780,6 +6780,11 @@ 预留字段12 + + + 讲师上级ID + + 讲师上级ID @@ -26082,7 +26087,7 @@ 预留字段12 - + 讲师上级ID @@ -38938,6 +38943,11 @@ 课程名称 + + + 讲师上级ID + + 开班成绩(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 595c9790..b123122d 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClassSchedule.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClassSchedule.Dto.Base.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/15 15:27:32 SimonHsiao 初版 +*V0.01 2025/5/15 9:59:12 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -135,6 +135,11 @@ public class Ghre_OpenClassScheduleBase /// public int? ReverseI2 { get; set; } + /// + /// 讲师上级ID + /// + public int? ParentTeacherId { get; set; } + /// /// 讲师上级ID /// diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClassSchedule.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClassSchedule.cs index eee63c9e..eaac412b 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClassSchedule.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClassSchedule.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/15 15:27:32 SimonHsiao 初版 +*V0.01 2025/5/15 9:59:12 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -139,5 +139,5 @@ public class Ghre_OpenClassSchedule : BasePoco /// /// 讲师上级ID /// - public long? TeacherSuperiorId { get; set; } + public int? ParentTeacherId { get; set; } } diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs index 8a8899a0..2cd2e78d 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs @@ -22,10 +22,10 @@ public class Ghre_OpenClassScheduleServices : BaseServices x.CourseId).Distinct().ToList(); var courses = await Db.Queryable().Where(x => courseIds.Contains(x.Id)).ToListAsync(); - data.ForEach( async x => + data.ForEach(async x => { - if (x.TeacherSuperiorId != null) - x.ParentTeacherName = (await Db.Queryable().FirstAsync(x => x.StaffID == x.TeacherSuperiorId))?.TeacherName; + if (x.ParentTeacherId != null) + x.ParentTeacherName = (await Db.Queryable().FirstAsync(a => a.StaffID == x.ParentTeacherId))?.StaffName; x.CourseName = courses.Where(o => x.CourseId == o.Id).FirstOrDefault()?.CourseName; x.StartEndTime.Add(x.StartTime); x.StartEndTime.Add(x.EndTime); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 69c67241..e58e0e66 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -6780,6 +6780,11 @@ 预留字段12 + + + 讲师上级ID + + 讲师上级ID @@ -26082,7 +26087,7 @@ 预留字段12 - + 讲师上级ID @@ -38938,6 +38943,11 @@ 课程名称 + + + 讲师上级ID + + 开班成绩(Dto.View1)