From 288908e306158226a4b91841133a075cf128b148 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Thu, 15 May 2025 09:49:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=8F=AD=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 22 +++++++++---------- .../Ghre/Ghre_OpenClassSchedule.Dto.View.cs | 5 +++++ .../Ghre/Ghre_OpenClassScheduleServices.cs | 8 +++++-- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 5de0d285..752fbfd6 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -10121,7 +10121,7 @@ DESTINATION 0 新宋体,8,N 1741251133 1741253579 -((39946,-9675), (46170,-900)) +((40058,-9675), (46058,-900)) ((43058,-9675),(43058,-900)) 2 1 @@ -10166,7 +10166,7 @@ DESTINATION 0 新宋体,8,N 1741253476 1741253575 -((39901,-2100), (46125,5325)) +((40013,-2100), (46013,5325)) ((43013,5325),(43013,-2100)) 2 1 @@ -10188,7 +10188,7 @@ DESTINATION 0 新宋体,8,N 1741253560 1741253591 -((39197,5850), (46921,13800)) +((39309,5850), (46809,13800)) ((43059,13800),(43059,5850)) 2 1 @@ -10210,7 +10210,7 @@ DESTINATION 0 新宋体,8,N 1741255050 1741255050 -((38289,14400), (47513,22350)) +((38401,14400), (47401,22350)) ((42901,22350),(42901,14400)) 2 1 @@ -10232,7 +10232,7 @@ DESTINATION 0 新宋体,8,N 1741255952 1741255952 -((49898,-1950), (56122,5325)) +((50010,-1950), (56010,5325)) ((53010,-1950),(53010,5325)) 2 1 @@ -50277,7 +50277,7 @@ Ghra_staff_InsureBase Ghre_OpenClassSchedule 1738913568 Administrator -1744681019 +1747273483 Administrator 开班课表 @@ -50450,12 +50450,12 @@ Ghra_staff_InsureBase bigint -3D4F79AD-A206-4BBF-94C8-F33E8B7955E0 +3012A035-5681-4EAD-A72D-C54EC003EE2C 讲师上级ID -TeacherSuperiorId -1744679973 +ParentTeacherId +1746500189 Administrator -1744684073 +1747273487 Administrator 讲师上级ID bigint 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 bbabee3a..ec7eb948 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassSchedule.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassSchedule.Dto.View.cs @@ -38,4 +38,9 @@ public class Ghre_OpenClassScheduleDto : Ghre_OpenClassSchedule public string CourseName { get; set; } public List StartEndTime { get; set; } = new List(); + + /// + /// 讲师上级ID + /// + public string ParentTeacherName { get; set; } } diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs index c6a2b4e9..8a8899a0 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs @@ -1,4 +1,6 @@ -namespace Tiobon.Core.Services; +using Tiobon.Core.Model; + +namespace Tiobon.Core.Services; /// /// 开班课表 (服务) @@ -20,8 +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(x => + data.ForEach( async x => { + if (x.TeacherSuperiorId != null) + x.ParentTeacherName = (await Db.Queryable().FirstAsync(x => x.StaffID == x.TeacherSuperiorId))?.TeacherName; x.CourseName = courses.Where(o => x.CourseId == o.Id).FirstOrDefault()?.CourseName; x.StartEndTime.Add(x.StartTime); x.StartEndTime.Add(x.EndTime);