页面修改

Edu.Module.Course/ClassModule.cs

@@ -268,22 +268,25 @@ namespace Edu.Module.Course
                 var classOrderList = new List<RB_Order_ViewModel>();
                 var stepPriceList = new List<RB_Class_StepPrice_ViewModel>();
                 var otherCourseList = new List<RB_Class_Course_Extend>();
+                var planList = new List<RB_Class_Plan_ViewModel>();
                 string ids = string.Join(",", list.Select(qitem => qitem.ClassId));
                 if (!string.IsNullOrEmpty(ids))
                 {
                     classTimeList = class_TimeRepository.GetClassTimeListRepository(ids);
                     classOrderList = orderRepository.GetClassOrderPeopleNumRepository(ids);
                     otherCourseList = GetClassCourseListModule(new RB_Class_Course_Extend() { QClassIds = ids });
+                    planList=class_PlanRepository.GetClassPlanMaxDataRepository(new RB_Class_Plan_ViewModel()
+                    {
+                        QClassIds = ids
+                    });
                 }
                 if (isGetStepPrice)
                 {
                     stepPriceList = class_StepPriceRepository.GetClassStepPriceListRepository(new RB_Class_StepPrice_ViewModel() { QClassIds = ids })?.ToList() ?? new List<RB_Class_StepPrice_ViewModel>();
                 }
-
                 //课程计划上课日期
                 foreach (var item in list)
                 {
-                    item.FinishTimeStr = Common.ConvertHelper.FormatDate(item.EndClassDate);
                     item.NewPlanDateTime = classTimeList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.NewPlanDateTime;
                     item.OrderStudentCount = classOrderList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.GuestNum ?? 0;
                     if (isGetStepPrice)
@@ -291,6 +294,12 @@ namespace Edu.Module.Course
                         item.ClassStepPriceList = stepPriceList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_StepPrice_ViewModel>();
                     }
                     item.OtherCourseList = otherCourseList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_Course_Extend>();
+                    var tempData = planList.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault();
+                    if (tempData != null)
+                    {
+                        item.EndClassDate = tempData.ClassDate;
+                    }
+                    item.FinishTimeStr = Common.ConvertHelper.FormatDate(item.EndClassDate);
                 }
             }
             return list;

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -1676,7 +1676,6 @@ namespace Edu.WebApi.Controllers.Course
         /// <returns></returns>
         public ApiResult GetNewTeacherPlan()
         {
-
             var query = new RB_Class_ViewModel()
             {
                 Group_Id = base.UserInfo.Group_Id,