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

Edu.Common/Enum/Finance/ReceiptTypeEnum.cs

@@ -21,5 +21,15 @@ namespace Edu.Common.Enum.Finance
         /// </summary>
         [EnumField("退课")]
         BackClass = 2,
+        /// <summary>
+        /// 停课
+        /// </summary>
+        [EnumField("停课")]
+        StopClass = 3,
+        /// <summary>
+        /// 临时上课邀请
+        /// </summary>
+        [EnumField("临时上课邀请")]
+        InvitationClass = 4,
     }
 }

Edu.Model/Entity/EduTask/RB_Change_ClassPlan.cs

@@ -67,6 +67,12 @@ namespace Edu.Model.Entity.EduTask
         /// </summary>
         public DateTime UpdateTime { get; set; }
 
+
+        // <summary>
+        /// 生效日期
+        /// </summary>
+        public DateTime? TakeEffectTime { get; set; }
+
         /// <summary>
         /// 原数据
         /// </summary>

Edu.Module.EduTask/ChangeClassPlanModule.cs

@@ -22,7 +22,7 @@ namespace Edu.Module.EduTask
         /// </summary>
         private readonly RB_Change_ClassPlanRepository change_ClassPlanRepository = new RB_Change_ClassPlanRepository();
 
-        
+
 
         /// <summary>
         /// 获取调课计划列表
@@ -36,7 +36,8 @@ namespace Edu.Module.EduTask
 
 
 
-        public bool UpdateChangeClassPlan(int id) {
+        public bool UpdateChangeClassPlan(int id)
+        {
 
             return change_ClassPlanRepository.UpdateChangeClassPlan(id);
         }
@@ -55,6 +56,7 @@ namespace Edu.Module.EduTask
                 {
                     {nameof(RB_Change_ClassPlan_ViewModel.ChangeType),extModel.ChangeType },
                     {nameof(RB_Change_ClassPlan_ViewModel.MoveType),extModel.MoveType },
+                      {nameof(RB_Change_ClassPlan_ViewModel.TakeEffectTime),extModel.TakeEffectTime },
                     {nameof(RB_Change_ClassPlan_ViewModel.SourceData),extModel.SourceData },
                     {nameof(RB_Change_ClassPlan_ViewModel.TargetData),extModel.TargetData },
                     {nameof(RB_Change_ClassPlan_ViewModel.UpdateBy),extModel.UpdateBy },
@@ -71,20 +73,20 @@ namespace Edu.Module.EduTask
                 {
                     var educationReceipt = new RB_Education_Receipt()
                     {
-                         Id=0,
-                         Title="调课申请",
-                         ReceiptType= Common.Enum.Finance.ReceiptTypeEnum.ChangeClass,
-                         RelationId=newId,
-                         ClassId=extModel.ClassId,
-                         Group_Id=extModel.Group_Id,
-                         School_Id=extModel.School_Id,
-                         CreateBy=extModel.CreateBy,
-                         CreateTime=extModel.CreateTime,
-                         UpdateBy=extModel.UpdateBy,
-                         UpdateTime=extModel.UpdateTime,
-                         VerifyStatus= Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit
+                        Id = 0,
+                        Title = "调课申请",
+                        ReceiptType = Common.Enum.Finance.ReceiptTypeEnum.ChangeClass,
+                        RelationId = newId,
+                        ClassId = extModel.ClassId,
+                        Group_Id = extModel.Group_Id,
+                        School_Id = extModel.School_Id,
+                        CreateBy = extModel.CreateBy,
+                        CreateTime = extModel.CreateTime,
+                        UpdateBy = extModel.UpdateBy,
+                        UpdateTime = extModel.UpdateTime,
+                        VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit
                     };
-                    flag= education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt,out string message);
+                    flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out string message);
                 }
             }
             return flag;

Edu.Repository/EduTask/RB_Change_ClassPlanRepository.cs

@@ -489,14 +489,14 @@ WHERE 1=1
                     {
                         if (model.ChangeType == 2)
                         {
-                            builder.AppendFormat(" update RB_Class_Plan SET  TeacherId={0} where DATE_FORMAT(ClassDate,'%Y-%m-%d')>=DATE_FORMAT('{1}','%Y-%m-%d')", allChangePlanModel.TeacherId, model.CreateTime);
+                            builder.AppendFormat(" update RB_Class_Plan SET  TeacherId={0} where DATE_FORMAT(ClassDate,'%Y-%m-%d')>=DATE_FORMAT('{1}','%Y-%m-%d')", allChangePlanModel.TeacherId, model.TakeEffectTime.Value.ToString("yyyy-MM-dd"));
                             string tIds = allChangePlanModel.TeacherId.ToString();
                             var teacherList = teacherRepository.GetTeacherListRepository(new Model.ViewModel.User.RB_Teacher_ViewModel() { QTIds = tIds });
                             logContent += string.Format("全局将讲师修改为【{0}】.", (teacherList?.Where(qitem => qitem.TId == allChangePlanModel.TeacherId)?.FirstOrDefault()?.TeacherName ?? ""));
                         }
                         else if (model.ChangeType == 3)
                         {
-                            builder.AppendFormat(" update RB_Class_Plan SET  ClassRoomId={0} where DATE_FORMAT(ClassDate,'%Y-%m-%d')>=DATE_FORMAT('{1}','%Y-%m-%d')", allChangePlanModel.ClassRoomId, model.CreateTime);
+                            builder.AppendFormat(" update RB_Class_Plan SET  ClassRoomId={0} where DATE_FORMAT(ClassDate,'%Y-%m-%d')>=DATE_FORMAT('{1}','%Y-%m-%d')", allChangePlanModel.ClassRoomId, model.TakeEffectTime.Value.ToString("yyyy-MM-dd"));
                             string roomIds = allChangePlanModel.ClassRoomId.ToString();
                             var roomList = class_RoomRepository.GetClassRoomListRepository(new Edu.Model.ViewModel.Course.RB_Class_Room_ViewModel() { QRoomIds = roomIds });
                             logContent += string.Format("全局将教室修改为【{0}】.", (roomList?.Where(qitem => qitem.RoomId == allChangePlanModel.ClassRoomId)?.FirstOrDefault()?.RoomName ?? ""));
@@ -507,7 +507,7 @@ WHERE 1=1
                         var oldPlanList = class_PlanRepository.GetClassPlanListRepository(new Edu.Model.ViewModel.Course.RB_Class_Plan_ViewModel()
                         {
                             ClassId = model.ClassId,
-                            StartTime = model.CreateTime.ToString("yyyy-MM-dd 00:00:00")
+                            StartTime = model.TakeEffectTime.Value.ToString("yyyy-MM-dd")
                         });
                         if (oldPlanList != null && oldPlanList.Any())//删除剩余的排课日期和时间
                         {

Edu.WebApi/Controllers/EduTask/ChangePlanController.cs

@@ -52,6 +52,8 @@ namespace Edu.WebApi.Controllers.EduTask
             var classModel = classModule.GetClassModule(model.ClassId);
             try
             {
+
+
                 if (model.MoveType == 1)
                 {
                     model.OldChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(base.ParmJObj.GetStringValue("OldChangePlanItemList"));
@@ -59,6 +61,12 @@ namespace Edu.WebApi.Controllers.EduTask
                 }
                 else
                 {
+                    string takeEffectTime = base.ParmJObj.GetStringValue("TakeEffectTime");
+                    if (string.IsNullOrWhiteSpace(takeEffectTime))
+                    {
+                        return ApiResult.Failed("请选择生效日期");
+                    }
+                    model.TakeEffectTime = Convert.ToDateTime(takeEffectTime);
                     model.AllChangePlanModel = Common.Plugin.JsonHelper.DeserializeObject<AllChangePlanItem>(base.ParmJObj.GetStringValue("AllChangePlanItem"));
                 }
             }