页面修改

Edu.Module.Course/ClassModule.cs

@@ -681,17 +681,46 @@ namespace Edu.Module.Course
             return flag;
         }
 
+        /// <summary>
+        /// 忽略上课计划
+        /// </summary>
+        /// <param name="classId"></param>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public bool IgnoreClassPlanModule(int classId, UserInfo user)
+        {
+            var classLogModel = new Model.Entity.Log.RB_Class_Log()
+            {
+                LogType = Common.Enum.Course.ClassLogTypeEnum.CreateClass,
+                LogContent = string.Format("班级管理员{0},放弃处理上课计划冲突", user.AccountName),
+                ClassId = classId,
+                Group_Id = user.Group_Id,
+                School_Id = user.School_Id,
+                CreateBy = user.Id,
+                CreateTime = System.DateTime.Now
+            };
+            return classLogRepository.AddClassLogRepository(classLogModel);
+        }
+
         /// <summary>
         /// 单个修改上课计划
         /// </summary>
         /// <returns></returns>
-        public bool UpdateClassPlanSingleModule(RB_Class_Plan_ViewModel model,int createBy, out bool result)
+        public bool UpdateClassPlanSingleModule(List<RB_Class_Plan_ViewModel> list,int createBy, out bool result)
         {
+            var flag = true;
             result = false;
-            var flag = SetClassPlanModule(model, createBy);
+            foreach (var item in list)
+            {
+                if (flag)
+                {
+                    flag = SetClassPlanModule(item, createBy);
+                }
+            }
+            
             if (flag)
             {
-                class_PlanRepository.CheckClassPlanRepeatRepository(model.ClassId, out result);
+                class_PlanRepository.CheckClassPlanRepeatRepository(list[0].ClassId, out result);
             }
             return flag;
         }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -432,51 +432,77 @@ namespace Edu.WebApi.Controllers.Course
         }
 
         /// <summary>
-        /// 上课计划单个调整
+        /// 忽略调整上课计划
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult IgnoreClassPlan()
+        {
+            var ClassId = base.ParmJObj.GetInt("ClassId");
+            var flag = classModule.IgnoreClassPlanModule(ClassId, base.UserInfo);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 批量调整上课计划多条数据修改
         /// </summary>
         public ApiResult UpdateClassPlanSingle()
         {
-            var extModel = new RB_Class_Plan_ViewModel()
+            List<RB_Class_Plan_ViewModel> list = new List<RB_Class_Plan_ViewModel>();
+            var planStr = base.ParmJObj.GetStringValue("PlanList");
+            if (!string.IsNullOrEmpty(planStr))
             {
-                ClassPlanId = base.ParmJObj.GetInt("ClassPlanId"),
-                ClassId = base.ParmJObj.GetInt("ClassId"),
-                ClassDate = base.ParmJObj.GetDateTime("ClassDate"),
-                Status = Common.Enum.DateStateEnum.Normal,
-                ClassRoomId = base.ParmJObj.GetInt("ClassRoomId"),
-                TeacherId = base.ParmJObj.GetInt("TeacherId"),
-            };
-            try
-            {
-                extModel.PlanTimeList = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Class_Time_ViewModel>>(base.ParmJObj.GetStringValue("PlanTimeList"));
-            }
-            catch (Exception ex)
-            {
-                Common.Plugin.LogHelper.Write(ex, "SetClassPlan_PlanTimeList");
-            }
-            if (extModel.PlanTimeList != null && extModel.PlanTimeList.Count > 0)
-            {
-                foreach (var item in extModel.PlanTimeList)
+                JArray jArray = JArray.Parse(planStr);
+                foreach (var jItem in jArray)
                 {
-                    string message = "";
-                    if (!Common.ConvertHelper.IsTime(item.StartTime + ":00"))
+                    JObject jobj = JObject.Parse(jItem.ToString());
+                    var extModel = new RB_Class_Plan_ViewModel()
                     {
-                        message = "【" + item.StartTime + "】格式不正确!(参考格式为 00:00)";
+                        ClassPlanId = jobj.GetInt("ClassPlanId"),
+                        ClassId = jobj.GetInt("ClassId"),
+                        ClassDate = jobj.GetDateTime("ClassDate"),
+                        Status = Common.Enum.DateStateEnum.Normal,
+                        ClassRoomId = jobj.GetInt("ClassRoomId"),
+                        TeacherId = jobj.GetInt("TeacherId"),
+                    };
+                    try
+                    {
+                        extModel.PlanTimeList = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Class_Time_ViewModel>>(jobj.GetStringValue("PlanTimeList"));
                     }
-                    if (!Common.ConvertHelper.IsTime(item.EndTime + ":00"))
+                    catch (Exception ex)
                     {
-                        if (!string.IsNullOrEmpty(message))
-                        {
-                            message += ",";
-                        }
-                        message += "【" + item.EndTime + "】格式不正确!(参考格式为 00:00)";
+                        Common.Plugin.LogHelper.Write(ex, "UpdateClassPlanSingle_PlanTimeList");
                     }
-                    if (!string.IsNullOrEmpty(message))
+                    if (extModel.PlanTimeList != null && extModel.PlanTimeList.Count > 0)
                     {
-                        return ApiResult.ParamIsNull(message: message);
+                        foreach (var item in extModel.PlanTimeList)
+                        {
+                            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))
+                            {
+                                return ApiResult.ParamIsNull(message: message);
+                            }
+                        }
                     }
+                    list.Add(extModel);
                 }
             }
-            var flag = classModule.UpdateClassPlanSingleModule(extModel, base.UserInfo.Id, out bool result);
+            if (list == null || (list != null && list.Count <= 0))
+            {
+                return ApiResult.ParamIsNull(message: "请选择要调整的上课计划!");
+            }
+            var flag = classModule.UpdateClassPlanSingleModule(list, base.UserInfo.Id, out bool result);
             return flag ? ApiResult.Success(data: result) : ApiResult.Failed();
         }