页面修改

Edu.Model/Entity/Course/RB_Class.cs

@@ -156,5 +156,15 @@ namespace Edu.Model.Entity.Course
 		/// 班级类型(1-学生班，2-社会班)
 		/// </summary>
 		public int ClassType { get; set; }
+
+		/// <summary>
+		/// 默认时间字符串JSON
+		/// </summary>
+		public string DefaultTimeJson { get; set; }
+
+		/// <summary>
+		/// 默认选中的日期、周
+		/// </summary>
+		public string DateJson { get; set; }
 	}
 }

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -84,6 +84,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public List<RB_Class_Time_ViewModel> ClassTimeList { get; set; }
 
+        /// <summary>
+        ///班级计划默认上课时间
+        /// </summary>
+        public List<RB_Class_Time_ViewModel> DefaultTimeList { get; set; }
+
         /// <summary>
         /// 开班开始时间
         /// </summary>

Edu.Module.Course/ClassModule.cs

@@ -150,6 +150,8 @@ namespace Edu.Module.Course
                     { nameof(RB_Class_ViewModel.ClassStatus),model.ClassStatus},
                     { nameof(RB_Class_ViewModel.InnerRemark),model.InnerRemark},
                     { nameof(RB_Class_ViewModel.ClassType),model.ClassType},
+                    { nameof(RB_Class_ViewModel.DefaultTimeJson),model.DefaultTimeJson},
+                    { nameof(RB_Class_ViewModel.DateJson),model.DateJson},
                     //{ nameof(RB_Class_ViewModel.CompleteProgress),model.CompleteProgress},
                     //{ nameof(RB_Class_ViewModel.OutRemark),model.OutRemark},
                 };
@@ -462,6 +464,14 @@ namespace Edu.Module.Course
                         item.PlanTimeList = timeList?.Where(qitem => qitem.ClassPlanId == item.ClassPlanId)?.ToList() ?? new List<RB_Class_Time_ViewModel>();
                     }
                 }
+                if (!string.IsNullOrEmpty(extModel.DefaultTimeJson))
+                {
+                    extModel.DefaultTimeList = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Class_Time_ViewModel>>(extModel.DefaultTimeJson);
+                }
+                if (!string.IsNullOrEmpty(extModel.DateJson))
+                { 
+                  extModel.WeekDayList= Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.DateJson);
+                }
             }
             return extModel;
         }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -139,12 +139,44 @@ namespace Edu.WebApi.Controllers.Course
             {
                 Common.Plugin.LogHelper.Write(ex, "SetClass_ClassStepPriceList");
             }
+            //排课方式
             try
             {
                 string WeekDayListStr = base.ParmJObj.GetStringValue("WeekDayList");
-                if (!string.IsNullOrEmpty(WeekDayListStr))
+                switch (extModel.ClassStyle)
                 {
-                    extModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(WeekDayListStr);
+                    //按周排课
+                    case ClassStyleEnum.Week:  
+                        if (!string.IsNullOrEmpty(WeekDayListStr))
+                        {
+                            extModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(WeekDayListStr);
+                            extModel.DateJson = Common.Plugin.JsonHelper.Serialize(extModel.WeekDayList);
+                        }
+                        else
+                        {
+                            extModel.DateJson = "";
+                        }
+                        break;
+                    //固定日期排课
+                    case ClassStyleEnum.FixedDate:
+                        if (!string.IsNullOrEmpty(WeekDayListStr))
+                        {
+                            extModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(WeekDayListStr);
+                            extModel.DateJson = Common.Plugin.JsonHelper.Serialize(extModel.WeekDayList);
+                        }
+                        else
+                        {
+                            extModel.DateJson = "";
+                        }
+                        break;
+                    //按月排课
+                    case ClassStyleEnum.Month:
+
+                        break;
+                    //网约课
+                    case ClassStyleEnum.OnLine:
+                        extModel.DateJson = "";
+                        break;
                 }
             }
             catch (Exception ex)
@@ -185,7 +217,13 @@ namespace Edu.WebApi.Controllers.Course
                         return ApiResult.ParamIsNull(message: message);
                     }
                 }
+                extModel.DefaultTimeJson = Common.Plugin.JsonHelper.Serialize(extModel.DefaultPlanTimeList);
             }
+            else
+            {
+                extModel.DefaultTimeJson = "";
+            }
+
             bool flag = classModule.SetClassModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }