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

Edu.Repository/EduTask/RB_Change_ClassPlanRepository.cs

@@ -69,7 +69,16 @@ WHERE 1=1
         {
             //查询当前调课信息
             bool flag = false;
-            var model = GetEntity(Id);
+            var receiptModel = education_ReceiptRepository.GetEntity(Id);
+            if (receiptModel == null || receiptModel.Id == 0)
+            {
+                return false;
+            }
+            if (receiptModel.ReceiptType != Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
+            {
+                return false;
+            }
+            var model = GetEntity(receiptModel.RelationId);
             if (model == null || model.Id == 0)
             {
                 return false;
@@ -114,9 +123,9 @@ WHERE 1=1
                                 {
                                     logContent += string.Format("{0}上课结束时间由【{1}】修改为【{2}】.", Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate), oldTimeModel.EndTime, itemTime.EndTime);
                                 }
-                                if (oldTimeModel.StartTime != itemTime.StartTime|| oldTimeModel.EndTime != itemTime.EndTime)
+                                if (oldTimeModel.StartTime != itemTime.StartTime || oldTimeModel.EndTime != itemTime.EndTime)
                                 {
-                                    builder.AppendFormat(" update rb_class_time SET  StartTime='{0}' ,EndTime='{1}' where ClassTimeId ={1};", itemTime.StartTime, itemTime.EndTime, itemTime.ClassTimeId);
+                                    builder.AppendFormat(" update rb_class_time SET  StartTime='{0}' ,EndTime='{1}' where ClassTimeId ={2};", itemTime.StartTime, itemTime.EndTime, itemTime.ClassTimeId);
                                 }
                             }
                         }