提交代码

Edu.Module.Course/ClassModule.cs

@@ -3111,12 +3111,17 @@ 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 maxPlanDateList = 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 });
+                    maxPlanDateList = class_PlanRepository.GetClassPlanMaxDataRepository(new RB_Class_Plan_ViewModel()
+                    {
+                        QClassIds = ids
+                    });
                 }
                 if (isGetStepPrice)
                 {
@@ -3126,6 +3131,8 @@ namespace Edu.Module.Course
                 //课程计划上课日期
                 foreach (var item in list)
                 {
+                    var finish = maxPlanDateList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.ClassDate;
+                    item.FinishTimeStr = Common.ConvertHelper.FormatDate(finish);
                     item.NewPlanDateTime = classTimeList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.NewPlanDateTime;
 
                     if (isGetStepPrice)

Edu.WebApi/Controllers/Course/TeacherClassController.cs

@@ -81,7 +81,9 @@ namespace Edu.WebApi.Controllers.Course
                     item.ClassStatus,
                     item.Status,
                     item.OtherCourseList,
-                    item.ClassNo
+                    item.ClassNo,
+                    item.FinishTimeStr,
+                    item.CouseId
                 });
             }
             pageModel.Count = rowsCount;

Edu.WebApi/Controllers/Public/HolidayController.cs

@@ -71,20 +71,7 @@ namespace Edu.WebApi.Controllers.Public
                 return ApiResult.Failed("节假日时间范围重合");
             }
 
-            if (dmodel.DayType == 1)//判断节假日是否有排课计划
-            {
-                var planList = classModule.GetClassPlanList_V3(new Model.ViewModel.Course.RB_Class_Plan_ViewModel
-                {
-                    Group_Id = userInfo.Group_Id,
-                    StartTime = dmodel.StartTime.ToString("yyyy-MM-dd 00:00:00"),
-                    EndTime = dmodel.EndTime.ToString("yyyy-MM-dd 00:00:00")
-                });
 
-                if (planList != null && planList.Any())
-                {
-                    return ApiResult.Failed("班级：" + string.Join(",", planList.Select(x => x.ClassName)) + "存在排课");
-                }
-            }
 
             if (dmodel.HolidayId == 0)
             {
@@ -96,6 +83,22 @@ namespace Edu.WebApi.Controllers.Public
             bool flag = holidayModule.SetHoliday(dmodel);
             if (flag)
             {
+
+                if (dmodel.DayType == 1)//判断节假日是否有排课计划
+                {
+                    var planList = classModule.GetClassPlanList_V3(new Model.ViewModel.Course.RB_Class_Plan_ViewModel
+                    {
+                        Group_Id = userInfo.Group_Id,
+                        StartTime = dmodel.StartTime.ToString("yyyy-MM-dd 00:00:00"),
+                        EndTime = dmodel.EndTime.ToString("yyyy-MM-dd 00:00:00")
+                    });
+
+                    if (planList != null && planList.Any())
+                    {
+                        return ApiResult.Success("班级：" + string.Join(",", planList.Select(x => x.ClassName)) + "存在排课");
+                    }
+                }
+                
                 return ApiResult.Success();
             }
             else