提交代码

Edu.Model/ViewModel/Course/RB_Class_Time_ViewModel.cs

@@ -23,6 +23,12 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string NewPlanDateTime { get; set; }
 
+
+        /// <summary>
+        /// 上课时间【日期+结束时间】
+        /// </summary>
+        public string NewEndPlanDateTime { get; set; }
+
         /// <summary>
         /// 随拍list
         /// </summary>

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -910,18 +910,25 @@ namespace Edu.WebApi.Controllers.Course
             model.WeekStr = StringHelper.GetJapanWeekChar(planDate.ClassDate);
             DateTime startTime = System.DateTime.Now;
             DateTime endTime = System.DateTime.Now;
+            DateTime maxStarttime = System.DateTime.Now;
             int planTimeNum = 0;
+            int jiangeTime = 0;
             if (planTiemList != null && planTiemList.Any())
             {
                 planTimeNum = planTiemList.Count();
                 planTiemList.ForEach(x => x.NewPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.StartTime);
+                planTiemList.ForEach(x => x.NewEndPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.EndTime);
+
+
                 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:mm");
-                model.ClassEndTime = planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("yyyy-MM-dd HH:mm:00");
+                maxStarttime = planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime));
+                endTime = planTiemList.Min(x => Convert.ToDateTime(x.NewEndPlanDateTime));
+                jiangeTime = Convert.ToInt32(maxStarttime.Subtract(startTime).TotalMinutes);
+                model.RestTime = maxStarttime.Subtract(endTime).TotalMinutes.ToString();
+                model.DayTime = model.DayTime + "~" + planTiemList.Max(x => Convert.ToDateTime(x.NewEndPlanDateTime)).ToString("HH:mm");
+              
+                model.ClassEndTime = planTiemList.Max(x => Convert.ToDateTime(x.NewEndPlanDateTime)).ToString("yyyy-MM-dd HH:mm:00");
             }
             var lessonPlanList = classModule.GetLessonPlanListRepository(extModel);
             model.ClassId = extModel.ClassId;
@@ -943,23 +950,35 @@ namespace Edu.WebApi.Controllers.Course
                 model.LessonPlanList = new List<RB_Class_LessonPlan_ViewModel>();
                 model.LessonPlanList = lessonPlanList;
 
+
+                if (model.LessonPlanList != null && model.LessonPlanList.Any())
+                {
+
+                    int lessPlanDetailsId = model.LessonPlanList[0].LessonPlanId;
                     foreach (var item in model.LessonPlanList)
                     {
                         item.LessonPlanDetailsList = new List<RB_Class_LessonPlanDetails_ViewModel>();
                         item.LessonPlanProjectsList = new List<RB_Class_LessonPlanProjects_ViewModel>();
                         item.LessonPlanDetailsList = detailsList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList();
+                        int tempDuration = 0;
+                        if (item.LessonPlanDetailsList != null && item.LessonPlanDetailsList.Any())
+                        {
+
                             foreach (var itemDetails in item.LessonPlanDetailsList)
                             {
-                        if (planTimeNum == 1)
+                                if (lessPlanDetailsId == itemDetails.LessonPlanId)
                                 {
-                            itemDetails.DurationEndTime = startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm");
+                                    tempDuration += itemDetails.Duration;
                                 }
                                 else
-
                                 {
-                            itemDetails.DurationEndTime = (startTime.AddMinutes(itemDetails.Duration) < endTime) ? startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm") : endTime.AddMinutes(itemDetails.Duration).ToString("HH:mm");
+                                    tempDuration += (itemDetails.Duration + jiangeTime);
+                                }
+
+                                itemDetails.DurationEndTime = startTime.AddMinutes(tempDuration).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)));
                         model.IsEditSummary += item.LessonPlanDetailsList.Where(x => !string.IsNullOrWhiteSpace(x.Summary)).Count();
@@ -967,6 +986,9 @@ namespace Edu.WebApi.Controllers.Course
 
                     }
                 }
+
+
+            }
             else
             {
                 model.LessonPlanList = new List<RB_Class_LessonPlan_ViewModel>