提交代码

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -797,13 +797,13 @@ namespace Edu.WebApi.Controllers.Course
             {
                 planTimeNum = planTiemList.Count();
                 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));
                 endTime = planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime));
 
                 model.RestTime = endTime.Subtract(startTime).TotalMilliseconds.ToString();
                 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);
             model.ClassId = extModel.ClassId;
@@ -837,11 +837,13 @@ namespace Edu.WebApi.Controllers.Course
                             itemDetails.DurationEndTime = startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm");
                         }
                         else
+
                         {
                             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.ForEach(x => x.ProjectContentList = (string.IsNullOrWhiteSpace(x.ProjectContent) ? new List<string>() : Common.Plugin.JsonHelper.DeserializeObject<List<string>>(x.ProjectContent)));
                 }
             }
             return ApiResult.Success("", model);
@@ -888,6 +890,7 @@ namespace Edu.WebApi.Controllers.Course
                         item.LessonPlanProjectsList = new List<RB_Class_LessonPlanProjects_ViewModel>();
                         item.LessonPlanDetailsList = detailsList.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);
                 }