Skip to content

E
Education
Commit 5e3c2922 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 3b0981a5
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 5e3c2922
...@@ -797,13 +797,13 @@ namespace Edu.WebApi.Controllers.Course ...@@ -797,13 +797,13 @@ namespace Edu.WebApi.Controllers.Course
{ {
planTimeNum = planTiemList.Count(); planTimeNum = planTiemList.Count();
planTiemList.ForEach(x => x.NewPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.StartTime); planTiemList.ForEach(x => x.NewPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.StartTime);
model.DayTime = planTiemList.Min(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:ss"); model.DayTime = planTiemList.Min(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:mm");
startTime = planTiemList.Min(x => Convert.ToDateTime(x.NewPlanDateTime)); startTime = planTiemList.Min(x => Convert.ToDateTime(x.NewPlanDateTime));
endTime = planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime)); endTime = planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime));
model.RestTime = endTime.Subtract(startTime).TotalMilliseconds.ToString(); model.RestTime = endTime.Subtract(startTime).TotalMilliseconds.ToString();
planTiemList.ForEach(x => x.NewPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.EndTime); planTiemList.ForEach(x => x.NewPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.EndTime);
model.DayTime = model.DayTime + "~" + planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:ss"); model.DayTime = model.DayTime + "~" + planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:mm");
} }
var lessonPlanList = classModule.GetLessonPlanListRepository(extModel); var lessonPlanList = classModule.GetLessonPlanListRepository(extModel);
model.ClassId = extModel.ClassId; model.ClassId = extModel.ClassId;
...@@ -837,11 +837,13 @@ namespace Edu.WebApi.Controllers.Course ...@@ -837,11 +837,13 @@ namespace Edu.WebApi.Controllers.Course
itemDetails.DurationEndTime = startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm"); itemDetails.DurationEndTime = startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm");
} }
else else
{ {
itemDetails.DurationEndTime = (startTime.AddMinutes(itemDetails.Duration) < endTime) ? startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm") : endTime.AddMinutes(itemDetails.Duration).ToString("HH:mm"); itemDetails.DurationEndTime = (startTime.AddMinutes(itemDetails.Duration) < endTime) ? startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm") : endTime.AddMinutes(itemDetails.Duration).ToString("HH:mm");
} }
} }
item.LessonPlanProjectsList = projectList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList(); item.LessonPlanProjectsList = projectList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList();
item.LessonPlanProjectsList.ForEach(x => x.ProjectContentList = (string.IsNullOrWhiteSpace(x.ProjectContent) ? new List<string>() : Common.Plugin.JsonHelper.DeserializeObject<List<string>>(x.ProjectContent)));
} }
} }
return ApiResult.Success("", model); return ApiResult.Success("", model);
...@@ -888,6 +890,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -888,6 +890,7 @@ namespace Edu.WebApi.Controllers.Course
item.LessonPlanProjectsList = new List<RB_Class_LessonPlanProjects_ViewModel>(); item.LessonPlanProjectsList = new List<RB_Class_LessonPlanProjects_ViewModel>();
item.LessonPlanDetailsList = detailsList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList(); item.LessonPlanDetailsList = detailsList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList();
item.LessonPlanProjectsList = projectList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList(); item.LessonPlanProjectsList = projectList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList();
item.LessonPlanProjectsList.ForEach(x => x.ProjectContentList = (string.IsNullOrWhiteSpace(x.ProjectContent) ? new List<string>() : Common.Plugin.JsonHelper.DeserializeObject<List<string>>(x.ProjectContent)));
} }
List.Add(model); List.Add(model);
} }
......
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