|
|
|
@ -22,10 +22,10 @@ public class Ghre_OpenClassScheduleServices : BaseServices<Ghre_OpenClassSchedul |
|
|
|
|
var data = await base.QueryDto(whereExpression); |
|
|
|
|
var courseIds = data.Select(x => x.CourseId).Distinct().ToList(); |
|
|
|
|
var courses = await Db.Queryable<Ghre_Course>().Where(x => courseIds.Contains(x.Id)).ToListAsync(); |
|
|
|
|
data.ForEach( async x => |
|
|
|
|
data.ForEach(async x => |
|
|
|
|
{ |
|
|
|
|
if (x.TeacherSuperiorId != null) |
|
|
|
|
x.ParentTeacherName = (await Db.Queryable<Ghra_Staff>().FirstAsync(x => x.StaffID == x.TeacherSuperiorId))?.TeacherName; |
|
|
|
|
if (x.ParentTeacherId != null) |
|
|
|
|
x.ParentTeacherName = (await Db.Queryable<Ghra_Staff>().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); |
|
|
|
|