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

Edu.Module.Course/ClassModule.cs

@@ -1867,7 +1867,7 @@ namespace Edu.Module.Course
         /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_Class_Plan_ViewModel> GetClassPlanModelRepository(RB_Class_Plan_ViewModel query)
+        public List<RB_Class_Plan_ViewModel> GetClassPlanEntityModule(RB_Class_Plan_ViewModel query)
         {
             return class_PlanRepository.GetClassPlanModelRepository(query);
         }

Edu.Repository/Course/RB_ClassRepository.cs

@@ -504,9 +504,6 @@ WHERE  c.`Status`=0 and sog.`Status`=0  ");
         }
 
 
-
-
-
         /// <summary>
         /// 获取app约课
         /// </summary>
@@ -531,12 +528,9 @@ where a.`Status`=0  and a.IsSubscribe=1 and ClassStatus in(1,2)");
         /// <returns></returns>
         public int GetMaxClassNoPrefix(string OpenTime)
         {
-            string sql = $@"select Max(ClassLetterNum) as ClassLetterNum from RB_Class where Status =0 and OpenTime ='{OpenTime}'";
+            string sql = $@"SELECT Max(ClassLetterNum) AS ClassLetterNum FROM RB_Class WHERE Status =0 AND OpenTime ='{OpenTime}'";
             var obj = ExecuteScalar(sql);
             return obj == null ? 0 : Convert.ToInt32(obj);
         }
-
-
- 
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -1014,7 +1014,7 @@ namespace Edu.WebApi.Controllers.Course
             }
 
             //判断今天有课没有
-            var planList = classModule.GetClassPlanModelRepository(new RB_Class_Plan_ViewModel
+            var planList = classModule.GetClassPlanEntityModule(new RB_Class_Plan_ViewModel
             {
                 Group_Id = base.UserInfo.Group_Id,
                 ClassId = list.FirstOrDefault().ClassId,
@@ -1111,7 +1111,7 @@ namespace Edu.WebApi.Controllers.Course
             var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = exModel.ClassId });
 
             //判断今天有课没有
-            var planList = classModule.GetClassPlanModelRepository(new RB_Class_Plan_ViewModel
+            var planList = classModule.GetClassPlanEntityModule(new RB_Class_Plan_ViewModel
             {
                 Group_Id = base.UserInfo.Group_Id,
                 ClassId = exModel.ClassId,