Commit 04292044 authored by liudong1993's avatar liudong1993

1

parent a86f4682
......@@ -3857,7 +3857,8 @@ namespace Edu.Module.Course
EndTime = ETime,
CompleteProgress = -1,
GuestList = item.Select(qitem => new { GuestName = qitem.StuName }),
AppointState = item.Where(x => x.State == CourseAppointStateEnum.WaitSure).Any() ? 1 : 2
AppointState = item.Where(x => x.State == CourseAppointStateEnum.WaitSure).Any() ? 1 : 2,
item.FirstOrDefault().ScrollMinNum
});
});
......@@ -4362,7 +4363,7 @@ namespace Edu.Module.Course
subList.Add(new
{
Id =0,
Id = 0,
ClassType = 3,
ClassId = 0,
ClassName = "约课",
......@@ -4377,7 +4378,8 @@ namespace Edu.Module.Course
CompleteProgress = -1,
FeedBackStatus = 0,
GuestList = item.Select(qitem => new { GuestName = qitem.StuName }),
AppointState = item.Where(x => x.State == CourseAppointStateEnum.WaitSure).Any() ? 1 : 2
AppointState = item.Where(x => x.State == CourseAppointStateEnum.WaitSure).Any() ? 1 : 2,
item.FirstOrDefault().ScrollMinNum
});
});
......
......@@ -479,7 +479,7 @@ namespace Edu.Module.Course
{
thing1 = new
{
value = demodel.CourseName+ "(第"+ demodel.ChapterNo+"次课)"//课程名称
value = demodel.CourseName//课程名称
},
name3 = new
{
......@@ -487,11 +487,11 @@ namespace Edu.Module.Course
},
time8 = new
{
value = StartTime//预约时间
value = StartTime//课程名称//预约时间
},
thing10 = new
{
value = demodel.RoomName+ " ("+ demodel.RoomSchoolName + ")"//上课地点
value = demodel.RoomName+ " ("+ demodel.RoomSchoolName + ")" + "(第" + demodel.ChapterNo + "次课)" //上课地点
},
thing5 = new
{
......@@ -540,19 +540,19 @@ namespace Edu.Module.Course
{
thing1 = new
{
value = demodel.CourseName + "(第" + demodel.ChapterNo + "次课)"//课程名称
value = demodel.CourseName//课程名称
},
thing3 = new
{
value = demodel.TeacherName//上课老师
value = demodel.TeacherName //上课老师
},
time2 = new
{
value = StartTime//预约时间
value = StartTime//课程名称//预约时间
},
thing4 = new
{
value = demodel.RoomName + " (" + demodel.RoomSchoolName + ")"//上课地点
value = demodel.RoomName + " (" + demodel.RoomSchoolName + ")" + "(第" + demodel.ChapterNo + "次课)" //上课地点
},
thing7 = new
{
......
......@@ -1900,11 +1900,11 @@ namespace Edu.Module.Course
{
thing1 = new
{
value = demodel.CourseName + "(第" + demodel.ChapterNo + "次课)"//课程名称
value = demodel.CourseName//课程名称
},
name3 = new
{
value = demodel.TeacherName//上课老师
value = demodel.TeacherName //上课老师
},
time8 = new
{
......@@ -1912,7 +1912,7 @@ namespace Edu.Module.Course
},
thing10 = new
{
value = demodel.RoomName + " (" + demodel.RoomSchoolName + ")"//上课地点
value = demodel.RoomName + " (" + demodel.RoomSchoolName + ")" + "(第" + demodel.ChapterNo + "次课)" //上课地点
},
thing5 = new
{
......@@ -1961,7 +1961,7 @@ namespace Edu.Module.Course
{
thing1 = new
{
value = demodel.CourseName + "(第" + demodel.ChapterNo + "次课)"//课程名称
value = demodel.CourseName
},
thing3 = new
{
......@@ -1969,11 +1969,11 @@ namespace Edu.Module.Course
},
time2 = new
{
value = StartTime//预约时间
value = StartTime //课程名称//预约时间
},
thing4 = new
{
value = demodel.RoomName + " (" + demodel.RoomSchoolName + ")"//上课地点
value = demodel.RoomName + " (" + demodel.RoomSchoolName + ")" + "(第" + demodel.ChapterNo + "次课)" //上课地点
},
thing7 = new
{
......
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