Commit df4c63a9 authored by 黄奎's avatar 黄奎

页面修改

parent 92af4a70
...@@ -3745,7 +3745,7 @@ namespace Edu.Module.Course ...@@ -3745,7 +3745,7 @@ namespace Edu.Module.Course
ClassType = 2, ClassType = 2,
ClassId = subItem.ReserveClassId, ClassId = subItem.ReserveClassId,
ClassName = "试听课", ClassName = "试听课",
CourseName = subItem.ClassContent, CourseName = subItem.LessonName,
subItem.RoomName, subItem.RoomName,
subItem.TeacherName, subItem.TeacherName,
Ranks = 0, Ranks = 0,
...@@ -3823,7 +3823,7 @@ namespace Edu.Module.Course ...@@ -3823,7 +3823,7 @@ namespace Edu.Module.Course
{ {
ClassId = item.ReserveClassId, ClassId = item.ReserveClassId,
ClassName = "试听课", ClassName = "试听课",
CourseName = item.ClassContent, CourseName = item.LessonName,
item.RoomName, item.RoomName,
item.TeacherName, item.TeacherName,
ClassDate=Common.ConvertHelper.FormatDate(item.ClassDate), ClassDate=Common.ConvertHelper.FormatDate(item.ClassDate),
...@@ -4025,7 +4025,7 @@ namespace Edu.Module.Course ...@@ -4025,7 +4025,7 @@ namespace Edu.Module.Course
ClassType = 2, ClassType = 2,
ClassId = subItem.ReserveClassId, ClassId = subItem.ReserveClassId,
ClassName = "试听课", ClassName = "试听课",
CourseName = subItem.ClassContent, CourseName = subItem.LessonName,
subItem.RoomName, subItem.RoomName,
subItem.TeacherName, subItem.TeacherName,
TimeStr = Common.ConvertHelper.GetTimeStr(currentDate), TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
......
...@@ -78,8 +78,10 @@ WHERE 1=1 ...@@ -78,8 +78,10 @@ WHERE 1=1
var parameters = new DynamicParameters(); var parameters = new DynamicParameters();
builder.Append(@" builder.Append(@"
SELECT A.*,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName,IFNULL(E.SeatNum,0) AS RoomNum SELECT A.*,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName,IFNULL(E.SeatNum,0) AS RoomNum
,IFNULL(G.LessonName,'') AS LessonName
FROM RB_Reserve_Class AS A LEFT JOIN rb_teacher AS D ON A.TeacherId=D.TId FROM RB_Reserve_Class AS A LEFT JOIN rb_teacher AS D ON A.TeacherId=D.TId
LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
LEFT JOIN rb_triallesson AS G ON A.TrialLessonId=G.Id
WHERE 1=1 WHERE 1=1
"); ");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.Status), (int)DateStateEnum.Normal); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.Status), (int)DateStateEnum.Normal);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment