页面修改

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -97,7 +97,7 @@ namespace Edu.Model.ViewModel.Course
         /// <summary>
         ///班级计划默认上课时间
         /// </summary>
-        public List<RB_Class_Time_ViewModel> DefaultTimeList { get; set; }
+        public List<ClassTimeItem> DefaultTimeList { get; set; }
 
         /// <summary>
         /// 课程优惠信息列表
@@ -132,11 +132,6 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public List<string> WeekDayList { get; set; }
 
-        /// <summary>
-        ///  默认上课时间
-        /// </summary>
-        public List<RB_Class_Time_ViewModel> DefaultPlanTimeList { get; set; }
-
         /// <summary>
         /// 月份
         /// </summary>
@@ -193,4 +188,37 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public decimal CourseOriginalPrice { get; set; }
     }
+
+    /// <summary>
+    /// 上课时间配置项
+    /// </summary>
+    public class ClassTimeItem
+    {
+
+        /// <summary>
+        /// 上课日期【ClassStyle:1-周(1,2...);2和3(具体日期)；4(暂无)】
+        /// </summary>
+        public List<string> DateList { get; set; }
+
+        /// <summary>
+        /// 具体上课时间
+        /// </summary>
+        public List<TimeItem> TimeList { get; set; }
+    }
+
+    /// <summary>
+    /// 上课时间对象
+    /// </summary>
+    public class TimeItem
+    {
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+    }
 }
\ No newline at end of file

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -88,7 +88,8 @@ namespace Edu.WebApi.Controllers.Course
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetClassListForProperty() {
+        public ApiResult GetClassListForProperty()
+        {
             var query = new RB_Class_ViewModel()
             {
                 CouseId = base.ParmJObj.GetInt("CourseId"),
@@ -257,36 +258,39 @@ namespace Edu.WebApi.Controllers.Course
                 string DefaultPlanTimeListStr = base.ParmJObj.GetStringValue("DefaultPlanTimeList");
                 if (!string.IsNullOrEmpty(DefaultPlanTimeListStr))
                 {
-                    extModel.DefaultPlanTimeList = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Class_Time_ViewModel>>(DefaultPlanTimeListStr);
+                    extModel.DefaultTimeList = Common.Plugin.JsonHelper.DeserializeObject<List<ClassTimeItem>>(DefaultPlanTimeListStr);
                 }
             }
             catch (Exception ex)
             {
                 Common.Plugin.LogHelper.Write(ex, "SetClass_DefaultPlanTimeList");
             }
-            if (extModel.DefaultPlanTimeList != null && extModel.DefaultPlanTimeList.Count > 0)
+            if (extModel.DefaultTimeList != null && extModel.DefaultTimeList.Count > 0)
             {
-                foreach (var item in extModel.DefaultPlanTimeList)
+                foreach (var rootItem in extModel.DefaultTimeList)
                 {
-                    string message = "";
-                    if (!Common.ConvertHelper.IsTime(item.StartTime + ":00"))
-                    {
-                        message = "【" + item.StartTime + "】格式不正确!(参考格式为 00:00)";
-                    }
-                    if (!Common.ConvertHelper.IsTime(item.EndTime + ":00"))
+                    foreach (var item in rootItem.TimeList)
                     {
+                        string message = "";
+                        if (!Common.ConvertHelper.IsTime(item.StartTime + ":00"))
+                        {
+                            message = "【" + item.StartTime + "】格式不正确!(参考格式为 00:00)";
+                        }
+                        if (!Common.ConvertHelper.IsTime(item.EndTime + ":00"))
+                        {
+                            if (!string.IsNullOrEmpty(message))
+                            {
+                                message += ",";
+                            }
+                            message += "【" + item.EndTime + "】格式不正确!(参考格式为 00:00)";
+                        }
                         if (!string.IsNullOrEmpty(message))
                         {
-                            message += ",";
+                            return ApiResult.ParamIsNull(message: message);
                         }
-                        message += "【" + item.EndTime + "】格式不正确!(参考格式为 00:00)";
-                    }
-                    if (!string.IsNullOrEmpty(message))
-                    {
-                        return ApiResult.ParamIsNull(message: message);
                     }
                 }
-                extModel.DefaultTimeJson = Common.Plugin.JsonHelper.Serialize(extModel.DefaultPlanTimeList);
+                extModel.DefaultTimeJson = Common.Plugin.JsonHelper.Serialize(extModel.DefaultTimeList);
             }
             else
             {
@@ -300,6 +304,32 @@ namespace Edu.WebApi.Controllers.Course
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 添加修改班级
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult InitClassTime()
+        {
+            var list = classModule.GetClassListModule(new RB_Class_ViewModel());
+            foreach (var item in list)
+            {
+                List<string> dateList = new List<string>();
+                if (!string.IsNullOrEmpty(item.DateJson))
+                {
+                    dateList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(item.DateJson);
+                }
+                if (dateList != null && dateList.Count > 0 && !string.IsNullOrEmpty(item.DefaultTimeJson))
+                {
+                    var model = Common.Plugin.JsonHelper.DeserializeObject<ClassTimeItem>(item.DefaultTimeJson);
+                    List<ClassTimeItem> slist = new List<ClassTimeItem>();
+                    slist.Add(model);
+                    bool flag = classModule.UpdateClassTimeModule(item.ClassId, Common.Plugin.JsonHelper.Serialize(slist));
+                }
+            }
+            return ApiResult.Success();
+        }
+
         /// <summary>
         /// 修改班级状态
         /// </summary>
@@ -346,8 +376,8 @@ namespace Edu.WebApi.Controllers.Course
                 CouseId = extModel?.CouseId ?? 0,
                 DateJson = extModel?.DateJson ?? "",
                 DefaultTimeJson = extModel?.DefaultTimeJson ?? "",
-                DefaultPlanTimeList = extModel?.DefaultPlanTimeList ?? new List<RB_Class_Time_ViewModel>(),
-                DefaultTimeList = extModel?.DefaultTimeList ?? new List<RB_Class_Time_ViewModel>(),
+                DefaultPlanTimeList = extModel?.DefaultTimeList ?? new List<ClassTimeItem>(),
+                DefaultTimeList = extModel?.DefaultTimeList ?? new List<ClassTimeItem>(),
                 EndClassDate = Common.ConvertHelper.FormatDate(extModel?.EndClassDate),
                 EndOrderTime = Common.ConvertHelper.FormatDate(extModel?.EndOrderTime),
                 EndTime = Common.ConvertHelper.FormatDate(extModel?.EndTime),