Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Course/ClassModule.cs

@@ -666,6 +666,20 @@ namespace Edu.Module.Course
             {
                 flag = class_PlanRepository.BatchUpdateClassPlanRepository(updatePlanList);
             }
+            if (result)
+            {
+                var classLogModel = new Model.Entity.Log.RB_Class_Log()
+                {
+                    LogType = Common.Enum.Course.ClassLogTypeEnum.CreateClass,
+                    LogContent = "创建上课计划成功!但是存在冲突的上课安排，等待管理员处理!",
+                    ClassId = ClassId,
+                    Group_Id = model.Group_Id,
+                    School_Id = model.School_Id,
+                    CreateBy = model.CreateBy,
+                    CreateTime = System.DateTime.Now
+                };
+                classLogRepository.AddClassLogRepository(classLogModel);
+            }
             return flag;
         }
 

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -368,10 +368,6 @@ namespace Edu.WebApi.Controllers.Course
                 extModel.DefaultTimeJson = "";
             }
             bool flag = classModule.SetClassModule(extModel);
-            //if (flag)
-            //{
-            //    classModule.UpdateClassEndDateModule(extModel.ClassId);
-            //}
             return flag ? ApiResult.Success(data:extModel) : ApiResult.Failed();
         }
 
@@ -392,6 +388,38 @@ namespace Edu.WebApi.Controllers.Course
             return flag ? ApiResult.Success(data: IsRepeat) : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 批量修改上课计划
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult BatchUpdateClassPlan()
+        {
+            var ClassId = base.ParmJObj.GetInt("ClassId");
+            //调动类型(1-课程，2-老师，3-教室,4-取消课程)
+            var ChangeType = base.ParmJObj.GetInt("ChangeType");
+            //调动选项(1-固定日期，2-全局调整)
+            int MoveType = base.ParmJObj.GetInt("MoveType");
+            var ClassRoomId = base.ParmJObj.GetInt("ClassRoomId");
+            var TeacherId = base.ParmJObj.GetInt("TeacherId");
+            var timeStr = base.ParmJObj.GetStringValue("TimeList");
+            var TimeList = new List<TimeItem>();
+            if (!string.IsNullOrEmpty(timeStr))
+            {
+                TimeList = Common.Plugin.JsonHelper.DeserializeObject<List<TimeItem>>(timeStr);
+            }
+ 
+            if (MoveType == 1)
+            {
+
+            }
+            else
+            { 
+            
+            }
+            bool flag = false;
+            return flag ? ApiResult.Success(data:false) : ApiResult.Failed();
+        }
+
         /// <summary>
         /// 获取有冲突的上课计划
         /// </summary>