提交代码

Edu.Model/ViewModel/Course/RB_Order_Guest_Extend.cs

@@ -47,7 +47,7 @@ namespace Edu.Model.ViewModel.Course
         /// <summary>
         /// 老师名称
         /// </summary>
-        public int TeacherName { get; set; }
+        public string TeacherName { get; set; }
 
         /// <summary>
         ///下单时间
@@ -111,7 +111,7 @@ namespace Edu.Model.ViewModel.Course
         /// <summary>
         /// 是否生效 (查询对应：（0-全部 1-未生效，2-正常，3-休学，4-完课）) （生效状态(0-未生效，1-生效中，2-完成)）
         /// </summary>
-        public int EffectStatus { get; set; }
+        public int? EffectStatus { get; set; }
 
         /// <summary>
         /// 订单报入类型（查询的时候0-全部1-正常报入，2-插班报入，3-续费订单，4-转班订单，5-分拆订单）

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -649,7 +649,7 @@ WHERE {where}";
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT a.*,contract.ContractNo,contract.Id as ContractId,b.CourseId,IFNULL(C.CourseName,'') AS CourseName
-       ,class.ClassName,class.ClassNo,class.Teacher_Id,teacher.TeacherName,b.OrderId,b.CreateTime as OrderTime,b.EnterID,b.PreferPrice,b.Income,b.Refund,b.PlatformTax,
+       ,class.ClassName,class.ClassNo,class.Teacher_Id,teacher.TeacherName,b.CreateTime as OrderTime,b.EnterID,b.PreferPrice,b.Income,b.Refund,b.PlatformTax,
 (a.TotalHours-a.CompleteHours) as SurplusHours,gc.AbsenceNum,gc.LeaveNum,eventlog.EventlogNum,b.EffectStatus,b.JoinType,sog.Student_Id
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
 LEFT JOIN rb_education_contract as contract on contract.GuestId=a.Id and contract.`Status`=0 
@@ -706,13 +706,13 @@ WHERE  1=1 and A.Status=0 and class.Status=0 and class.ClassStatus <>4  and b.Or
             {
                 builder.AppendFormat($@" AND  DATE_FORMAT(B.CreateTime,'%y-%m-%d')<=DATE_FORMAT('{demodel.EndOrderTime.Value.ToString("yyyy-MM-dd")}','%y-%m-%d')");
             }
-            if (demodel.EffectStatus > 0)
+            if (demodel.EffectStatus.HasValue)
             {
-                if (demodel.EffectStatus == 1)
+                if (demodel.EffectStatus == 0)
                 {
                     builder.AppendFormat($@" AND B.{nameof(RB_Order_Guest_Extend.EffectStatus)} =0");
                 }
-                else 
+                else
                 {
                     builder.AppendFormat($@" AND B.{nameof(RB_Order_Guest_Extend.EffectStatus)} >0");
                     builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_Extend.GuestState)} ={demodel.GuestState}");
@@ -738,7 +738,7 @@ WHERE  1=1 and A.Status=0 and class.Status=0 and class.ClassStatus <>4  and b.Or
             {
                 builder.AppendFormat($@" AND (a.TotalHours-a.CompleteHours) <20 ");
             }
-            builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_ViewModel.Id)} desc");
+            builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_Extend.Id)} desc");
             return GetPage<RB_Order_Guest_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
 

Edu.WebApi/Controllers/Course/StuController.cs

@@ -286,7 +286,6 @@ namespace Edu.WebApi.Controllers.Course
                 ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
                 OrderId = base.ParmJObj.GetInt("OrderId", 0),
                 EnterID = base.ParmJObj.GetInt("EnterID", 0),
-                EffectStatus = base.ParmJObj.GetInt("EffectStatus", 0),
                 JoinType = base.ParmJObj.GetInt("JoinType", 0),
                 EarlyWarning = (Common.Enum.Course.GuestClassHoursEarlyWarningEnum)base.ParmJObj.GetInt("EarlyWarning", 0),
             };
@@ -297,6 +296,11 @@ namespace Edu.WebApi.Controllers.Course
                 {
                     model.OrderTime = Convert.ToDateTime(OrderTime);
                 }
+                string EffectStatus = base.ParmJObj.GetStringValue("EffectStatus");
+                if (!string.IsNullOrWhiteSpace(EffectStatus))
+                {
+                    model.EffectStatus = Convert.ToInt32(EffectStatus);
+                }
                 string EndOrderTime = base.ParmJObj.GetStringValue("EndOrderTime");
                 if (!string.IsNullOrWhiteSpace(EndOrderTime))
                 {