页面修改

Edu.Module.Course/OrderModule.cs

@@ -182,7 +182,7 @@ namespace Edu.Module.Course
                 string k2classIds = string.Join(",", list.Where(x => x.ClassStyle == Common.Enum.Course.ClassStyleEnum.FixedDate).Select(x => x.ClassId));
                 if (!string.IsNullOrEmpty(k2classIds))
                 {
-                    PlanFixed = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel() { QClassIds = k2classIds });
+                    PlanFixed = class_PlanRepository.GetClassPlanListRepository(new RB_Class_Plan_ViewModel() { QClassIds = k2classIds });
                 }
                 foreach (var item in list)
                 {

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -1842,6 +1842,21 @@ namespace Edu.WebApi.Controllers.Course
         {
             var startDate = base.ParmJObj.GetStringValue("StartTime");
             var endDate = base.ParmJObj.GetStringValue("EndTime");
+            if (string.IsNullOrEmpty(startDate))
+            {
+                startDate = Common.ConvertHelper.FormatDate(DateTime.Now.AddDays(1 - DateTime.Now.Day).Date);
+            }
+            if (string.IsNullOrEmpty(endDate))
+            {
+                endDate = Common.ConvertHelper.FormatDate(DateTime.Now);
+            }
+            else
+            {
+                if (Convert.ToDateTime(endDate) > Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
+                {
+                    endDate = Common.ConvertHelper.FormatDate(DateTime.Now);
+                }
+            }
             RB_Class_Plan_ViewModel query = new RB_Class_Plan_ViewModel()
             {
                 StartTime = startDate,