提交代码

Edu.Model/ViewModel/EduTask/RB_Change_ClassPlan_ViewModel.cs

@@ -10,7 +10,16 @@ namespace Edu.Model.ViewModel.EduTask
     /// </summary>
     public class RB_Change_ClassPlan_ViewModel : RB_Change_ClassPlan
     {
+        /// <summary>
+        /// 调整原数据信息
+        /// </summary>
+        public List<ChangePlanItem> OldChangePlanItemList { get; set; }
 
+
+        /// <summary>
+        /// 调整新数据信息
+        /// </summary>
+        public List<ChangePlanItem> NewChangePlanItemList { get; set; }
     }
 
     public class ChangePlanItem
@@ -35,6 +44,11 @@ namespace Edu.Model.ViewModel.EduTask
         /// </summary>
         public int ClassRoomId { get; set; }
 
+        /// <summary>
+        ///班级计划上课日期的上课时间表
+        /// </summary>
+        public List<Course.RB_Class_Time_ViewModel> PlanTimeList { get; set; }
+
 
     }
 }

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -293,11 +293,12 @@ WHERE  1=1 and A.Status=0    and b.OrderState<>3
             {
                 builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.SourceId)} ={demodel.SourceId}");
             }
-            
+
             if (demodel.GuestState > 0)
             {
                 builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}");
             }
+            builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_ViewModel.Id)} desc");
             return GetPage<RB_Order_Guest_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
     }

Edu.WebApi/Controllers/EduTask/ChangePlanController.cs

 using Edu.Common.API;
 using Edu.Common.Plugin;
+using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.EduTask;
 using Edu.Module.EduTask;
 using Edu.WebApi.Filter;
@@ -36,18 +37,62 @@ namespace Edu.WebApi.Controllers.EduTask
         {
             var model = new RB_Change_ClassPlan_ViewModel()
             {
-                Id=base.ParmJObj.GetInt("Id"),
-                ClassId=base.ParmJObj.GetInt("ClassId"),
-                CourseId=base.ParmJObj.GetInt("CourseId"),
-                ChangeType=base.ParmJObj.GetInt("ChangeType"),
-                MoveType=base.ParmJObj.GetInt("MoveType"),
-                SourceData=base.ParmJObj.GetStringValue("SourceData"),
-                TargetData=base.ParmJObj.GetStringValue("TargetData"),
+                Id = base.ParmJObj.GetInt("Id"),
+                ClassId = base.ParmJObj.GetInt("ClassId"),
+                CourseId = base.ParmJObj.GetInt("CourseId"),
+                ChangeType = base.ParmJObj.GetInt("ChangeType"),
+                MoveType = base.ParmJObj.GetInt("MoveType"),
+                // SourceData=base.ParmJObj.GetStringValue("SourceData"),
+                // TargetData=base.ParmJObj.GetStringValue("TargetData"),
             };
-            model.Group_Id = base.UserInfo.Group_Id;
-            model.School_Id = base.UserInfo.School_Id;
-            model.CreateBy = base.UserInfo.Id;
-            model.CreateTime = DateTime.Now;
+            try
+            {
+                model.OldChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(base.ParmJObj.GetStringValue("OldChangePlanItemList"));
+                model.NewChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(base.ParmJObj.GetStringValue("NewChangePlanItemList"));
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "SetChangeClassPlan");
+            }
+
+            if (model.ChangeType == 1)//调课
+            {
+                if (model.OldChangePlanItemList.Count() != model.NewChangePlanItemList.Count())
+                {
+                    return ApiResult.Failed("排课原次数与现有次数不一致");
+                }
+                foreach (var item in model.OldChangePlanItemList)
+                {
+                    if (item.PlanTimeList.Count() != model.NewChangePlanItemList.Where(x => x.ClassDate == item.ClassDate).Count())
+                    {
+                        return ApiResult.Failed(item.ClassDate.ToString("yyyy-MM-dd") + "号的排课原课时数与现有课时数不一致");
+                    }
+                }
+            }
+            if (model.OldChangePlanItemList != null && model.OldChangePlanItemList.Any())
+            {
+                model.SourceData = JsonHelper.Serialize(model.OldChangePlanItemList);
+            }
+            else
+            {
+                model.SourceData = "";
+            }
+            if (model.NewChangePlanItemList != null && model.NewChangePlanItemList.Any())
+            {
+                model.TargetData = JsonHelper.Serialize(model.NewChangePlanItemList);
+            }
+            else
+            {
+                model.TargetData = "";
+            }
+
+            if (model.Id == 0)
+            {
+                model.CreateBy = base.UserInfo.Id;
+                model.CreateTime = DateTime.Now;
+                model.Group_Id = base.UserInfo.Group_Id;
+                model.School_Id = base.UserInfo.School_Id;
+            }
             model.UpdateBy = base.UserInfo.Id;
             model.UpdateTime = DateTime.Now;
             bool flag = changeClassPlanModule.SetChangeClassPlanModule(model);