提交代码

Edu.Repository/EduTask/RB_Change_ClassPlanRepository.cs

@@ -118,24 +118,34 @@ WHERE 1=1
                                 logContent += string.Format("日期由【{0}】修改为【{1}】.", Common.ConvertHelper.FormatDate(item.ClassDate), Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate));
                                 builder.AppendFormat(" update RB_Class_Plan SET  ClassDate='{0}' where ClassPlanId ={1};", newChangePlanItemModel.ClassDate, item.ClassPlanId);
                             }
-                            foreach (var itemTime in newChangePlanItemModel.PlanTimeList)
+                            foreach (var itemOldTime in item.PlanTimeList)//修改或者删除之前的
                             {
-                                var oldTimeModel = item.PlanTimeList.Where(x => x.ClassTimeId == itemTime.ClassTimeId).FirstOrDefault();
-                                if (oldTimeModel != null && oldTimeModel.ClassTimeId > 0)
+                                var newTimeModel = newChangePlanItemModel.PlanTimeList.Where(x => x.ClassTimeId > 0 && x.ClassTimeId == itemOldTime.ClassTimeId).FirstOrDefault();//以前与现在都有只是修改了日期
+                                if (newTimeModel != null && newTimeModel.ClassTimeId > 0)
                                 {
-                                    if (oldTimeModel.StartTime != itemTime.StartTime)
+                                    if (newTimeModel.StartTime != itemOldTime.StartTime)
                                     {
-                                        logContent += string.Format("{0}上课开始时间由【{1}】修改为【{2}】.", Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate), oldTimeModel.StartTime, itemTime.EndTime);
+                                        logContent += string.Format("{0}上课开始时间由【{1}】修改为【{2}】.", Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate), itemOldTime.StartTime, newTimeModel.EndTime);
                                     }
-                                    if (oldTimeModel.EndTime != itemTime.EndTime)
+                                    if (newTimeModel.EndTime != itemOldTime.EndTime)
                                     {
-                                        logContent += string.Format("{0}上课结束时间由【{1}】修改为【{2}】.", Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate), oldTimeModel.EndTime, itemTime.EndTime);
+                                        logContent += string.Format("{0}上课结束时间由【{1}】修改为【{2}】.", Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate), itemOldTime.EndTime, newTimeModel.EndTime);
                                     }
-                                    if (oldTimeModel.StartTime != itemTime.StartTime || oldTimeModel.EndTime != itemTime.EndTime)
+                                    if (newTimeModel.StartTime != itemOldTime.StartTime || newTimeModel.EndTime != itemOldTime.EndTime)
                                     {
-                                        builder.AppendFormat(" update rb_class_time SET  StartTime='{0}' ,EndTime='{1}' where ClassTimeId ={2};", itemTime.StartTime, itemTime.EndTime, itemTime.ClassTimeId);
+                                        builder.AppendFormat(" update rb_class_time SET  StartTime='{0}' ,EndTime='{1}' where ClassTimeId ={2};", newTimeModel.StartTime, newTimeModel.EndTime, newTimeModel.ClassTimeId);
                                     }
                                 }
+                                else
+                                {
+                                    builder.AppendFormat(" DELETE  FROM  rb_class_time where classtimeId  in({0});", itemOldTime.ClassTimeId);
+                                    logContent += string.Format("删除{0}上课时间【{1}】-【{2}】.", Common.ConvertHelper.FormatDate(item.ClassDate), itemOldTime.StartTime, itemOldTime.EndTime);
+                                }
+                            }
+                            foreach (var itemNewTime in newChangePlanItemModel.PlanTimeList.Where(x => x.ClassTimeId == 0))//新增上课时间
+                            {
+                                builder.AppendFormat("INSERT into rb_class_time (ClassId,ClassPlanId,StartTime,EndTime,Group_Id,School_Id,ClassStatus)VALUES({0},{1},'{2}','{3}',{4},{5},{6});", model.ClassId, item.ClassPlanId, itemNewTime.StartTime, itemNewTime.EndTime, model.Group_Id, model.School_Id, 0);
+                                logContent += string.Format("{0}新增上课开始时间【{1}】-【{2}】.", Common.ConvertHelper.FormatDate(item.ClassDate), itemNewTime.StartTime, itemNewTime.EndTime);
                             }
                         }
                     }

Edu.WebApi/Controllers/EduTask/ChangePlanController.cs

@@ -73,14 +73,14 @@ namespace Edu.WebApi.Controllers.EduTask
                     {
                         return ApiResult.Failed("排课原次数与现有次数不一致");
                     }
-                    foreach (var item in model.OldChangePlanItemList)
-                    {
-                        var newChangePlanModel = model.NewChangePlanItemList.Where(x => x.ClassPlanId == item.ClassPlanId).FirstOrDefault();
-                        if (item.PlanTimeList.Count() != newChangePlanModel.PlanTimeList.Count())
-                        {
-                            return ApiResult.Failed(item.ClassDate.ToString("yyyy-MM-dd") + "号的排课原课时数与现有课时数不一致");
-                        }
-                    }
+                    //foreach (var item in model.OldChangePlanItemList)
+                    //{
+                    //    var newChangePlanModel = model.NewChangePlanItemList.Where(x => x.ClassPlanId == item.ClassPlanId).FirstOrDefault();
+                    //    if (item.PlanTimeList.Count() != newChangePlanModel.PlanTimeList.Count())
+                    //    {
+                    //        return ApiResult.Failed(item.ClassDate.ToString("yyyy-MM-dd") + "号的排课原课时数与现有课时数不一致");
+                    //    }
+                    //}
                 }
                 else if (model.ChangeType == 2)
                 {