页面修改

Edu.Model/Entity/Course/RB_Order.cs

@@ -211,7 +211,7 @@ namespace Edu.Model.Entity.Course
         public int StartClassHours { get; set; }
 
         /// <summary>
-        /// 是否插班报入
+        /// 是否插班报入(1是)
         /// </summary>
         public int IsChaBan { get; set; }
 

Edu.Module.Course/OrderModule.cs

@@ -458,21 +458,30 @@ namespace Edu.Module.Course
             }
             if (demodel.OrderId > 0)
             {
-                if (orderModel.EffectStatus != 2)
+                if (demodel.IsChaBan == 1)
                 {
-                    if (demodel.EffectTime < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
+                    if (orderModel.EffectStatus != 2)
                     {
-                        demodel.EffectStatus = 0;
+                        if (demodel.EffectTime < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
+                        {
+                            demodel.EffectStatus = 0;
+                        }
+                        else
+                        {
+                            demodel.EffectStatus = 1;
+                        }
                     }
                     else
                     {
-                        demodel.EffectStatus = 1;
+                        demodel.EffectStatus = orderModel.EffectStatus;
                     }
                 }
-                else
+                else 
                 {
-                    demodel.EffectStatus = orderModel.EffectStatus;
+                    demodel.EffectStatus = 2;
+                    demodel.EffectTime = DateTime.Now;
                 }
+       
                 if (orderModel == null)
                 {
                     flag = false;
@@ -583,13 +592,21 @@ namespace Edu.Module.Course
             }
             else
             {
-                if (demodel.EffectTime < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
+                if (demodel.IsChaBan == 1)
                 {
-                    demodel.EffectStatus = 1;
+                    if (demodel.EffectTime < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
+                    {
+                        demodel.EffectStatus = 1;
+                    }
+                    else
+                    {
+                        demodel.EffectStatus = 0;
+                    }
                 }
                 else
                 {
-                    demodel.EffectStatus = 0;
+                    demodel.EffectStatus = 1;
+                    demodel.EffectTime = DateTime.Now;
                 }
                 if (classModel.ClassStatus == Common.Enum.Course.ClassStatusEnum.EndClass || classModel.ClassStatus == Common.Enum.Course.ClassStatusEnum.CancelClass)
                 {