Commit 083143c4 authored by liudong1993's avatar liudong1993

1

parent 267ac48f
...@@ -107,6 +107,11 @@ namespace Edu.Model.ViewModel.Scroll ...@@ -107,6 +107,11 @@ namespace Edu.Model.ViewModel.Scroll
/// </summary> /// </summary>
public string Description { get; set; } public string Description { get; set; }
/// <summary>
/// 已报名教室ID
/// </summary>
public int RoomId { get; set; }
public DateTime SDate { get => Convert.ToDateTime("2022-01-01 " + this.StartTime); } public DateTime SDate { get => Convert.ToDateTime("2022-01-01 " + this.StartTime); }
public DateTime EDate { get => Convert.ToDateTime("2022-01-01 " + this.EndTime); } public DateTime EDate { get => Convert.ToDateTime("2022-01-01 " + this.EndTime); }
} }
......
...@@ -2556,6 +2556,7 @@ namespace Edu.Module.Course ...@@ -2556,6 +2556,7 @@ namespace Edu.Module.Course
z.CourseName = firstModel.CourseName; z.CourseName = firstModel.CourseName;
z.CourseGradeNo = x.Key.CourseGradeNo; z.CourseGradeNo = x.Key.CourseGradeNo;
z.PeopleNum = x.Count(); z.PeopleNum = x.Count();
z.RoomId = firstModel.RoomId;
}); });
}); });
} }
...@@ -2573,6 +2574,7 @@ namespace Edu.Module.Course ...@@ -2573,6 +2574,7 @@ namespace Edu.Module.Course
if (demodel.CourseGradeNo != item.CourseGradeNo) { return "预约课程章节不一致"; } if (demodel.CourseGradeNo != item.CourseGradeNo) { return "预约课程章节不一致"; }
if (item.PeopleNum + 1 > item.MaxPeopleNum) { return "该时段已预约满,请预约其他时段"; } if (item.PeopleNum + 1 > item.MaxPeopleNum) { return "该时段已预约满,请预约其他时段"; }
demodel.CourseId = item.CourseId; demodel.CourseId = item.CourseId;
demodel.RoomId = item.RoomId;
} }
demodel.CourseEndTime = Convert.ToDateTime(Date + " " + timeList.Max(x => x.EndTime));//上完课的时间 demodel.CourseEndTime = Convert.ToDateTime(Date + " " + timeList.Max(x => x.EndTime));//上完课的时间
......
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