新增配置

Edu.Common/Config.cs

@@ -718,5 +718,17 @@ namespace Edu.Common
                 return ReadConfigKey("EducationContractAdmin");
             }
         }
+
+        /// <summary>
+        /// 是否开启调课验证
+        /// </summary>
+        public static int IsOpenChangeClassVerify
+        {
+            get
+            {
+                int.TryParse(ReadConfigKey("IsOpenChangeClassVerify"), out int IsOpenChangeClassVerify);
+                return IsOpenChangeClassVerify;
+            }
+        }
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/EduTask/ChangePlanController.cs

@@ -129,13 +129,13 @@ namespace Edu.WebApi.Controllers.EduTask
                         });
                     }
                 }
-                if (timeList != null && timeList.Count > 0)
+                if (Common.Config.IsOpenChangeClassVerify==1&&timeList != null && timeList.Count > 0)
                 {
-                    //var objList = changeClassPlanModule.GetRepeatListModule(model.ClassId, model.NewChangePlanItemList, timeList);
-                    //if (objList != null && objList.Count > 0)
-                    //{
-                    //    return ApiResult.Failed("存在上课计划冲突的数据!", data: objList);
-                    //}
+                    var objList = changeClassPlanModule.GetRepeatListModule(model.ClassId, model.NewChangePlanItemList, timeList);
+                    if (objList != null && objList.Count > 0)
+                    {
+                        return ApiResult.Failed("存在上课计划冲突的数据!", data: objList);
+                    }
                 }
             }
             //全局修改
@@ -225,11 +225,11 @@ namespace Edu.WebApi.Controllers.EduTask
                     {
                         return ApiResult.Failed("班级信息不存在");
                     }
-                    //var dateList = changeClassPlanModule.GetAllDateAndTimeRepeatListModule(model.ClassId, model.AllChangePlanModel,base.UserInfo);
-                    //if (dateList != null && dateList.Count > 0)
-                    //{
-                    //    return ApiResult.Failed("存在上课计划冲突的数据!", data: dateList);
-                    //}
+                    var dateList = changeClassPlanModule.GetAllDateAndTimeRepeatListModule(model.ClassId, model.AllChangePlanModel, base.UserInfo);
+                    if (Common.Config.IsOpenChangeClassVerify == 1 && dateList != null && dateList.Count > 0)
+                    {
+                        return ApiResult.Failed("存在上课计划冲突的数据!", data: dateList);
+                    }
                 }
                 else if (model.ChangeType == 2)
                 {
@@ -237,11 +237,11 @@ namespace Edu.WebApi.Controllers.EduTask
                     {
                         return ApiResult.Failed("请选择老师");
                     }
-                    //var teacherlist = changeClassPlanModule.GetAllRepeatListModule(model.ClassId, Common.ConvertHelper.FormatDate(model.TakeEffectTime), TeacherId: model.AllChangePlanModel.TeacherId);
-                    //if (teacherlist != null && teacherlist.Count > 0)
-                    //{
-                    //    return ApiResult.Failed("存在上课计划冲突的数据!", data: teacherlist);
-                    //}
+                    var teacherlist = changeClassPlanModule.GetAllRepeatListModule(model.ClassId, Common.ConvertHelper.FormatDate(model.TakeEffectTime), TeacherId: model.AllChangePlanModel.TeacherId);
+                    if (Common.Config.IsOpenChangeClassVerify == 1 && teacherlist != null && teacherlist.Count > 0)
+                    {
+                        return ApiResult.Failed("存在上课计划冲突的数据!", data: teacherlist);
+                    }
                 }
                 else if (model.ChangeType == 3)
                 {
@@ -249,11 +249,11 @@ namespace Edu.WebApi.Controllers.EduTask
                     {
                         return ApiResult.Failed("请选择教室");
                     }
-                    //var classroomlist = changeClassPlanModule.GetAllRepeatListModule(model.ClassId, Common.ConvertHelper.FormatDate(model.TakeEffectTime), ClassRoomId: model.AllChangePlanModel.ClassRoomId);
-                    //if (classroomlist != null && classroomlist.Count > 0)
-                    //{
-                    //   return ApiResult.Failed("存在上课计划冲突的数据!", data: classroomlist);
-                    //}
+                    var classroomlist = changeClassPlanModule.GetAllRepeatListModule(model.ClassId, Common.ConvertHelper.FormatDate(model.TakeEffectTime), ClassRoomId: model.AllChangePlanModel.ClassRoomId);
+                    if (Common.Config.IsOpenChangeClassVerify == 1 && classroomlist != null && classroomlist.Count > 0)
+                    {
+                        return ApiResult.Failed("存在上课计划冲突的数据!", data: classroomlist);
+                    }
                 }
             }
             if (model.OldChangePlanItemList != null && model.OldChangePlanItemList.Any())

Edu.WebApi/appsettings.json

@@ -91,5 +91,7 @@
   //订单转班流程编号
   "OrderTransClassFlowId": 5,
   //订单分拆流程编号
-    "OrderSplitClassFlowId": 6
+  "OrderSplitClassFlowId": 6,
+  //是否开启调课数据验证
+  "IsOpenChangeClassVerify":1,
 }
\ No newline at end of file