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

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -231,6 +231,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int UsePlanNum { get; set; }
 
+        /// <summary>
+        /// 多个课程状态（如：2,3）
+        /// </summary>
+        public string MoreStatus { get; set; }
+
         /// <summary>
         /// 是否查询剩余的上课计划
         /// </summary>

Edu.Repository/Course/RB_ClassRepository.cs

@@ -48,6 +48,18 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_ViewModel.ClassId), query.Q_ClassIds);
                 }
+                if (query.School_Id > -1)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.School_Id), query.School_Id);
+                }
+                if (query.Teacher_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Teacher_Id), query.Teacher_Id);
+                }
+                if (!string.IsNullOrEmpty(query.MoreStatus))
+                {
+                    builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_ViewModel.ClassStatus), query.MoreStatus);
+                }
                 //查询未报满的班级
                 if (query.IsQuerySurplus == 1)
                 {

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -126,13 +126,18 @@ namespace Edu.WebApi.Controllers.Course
             int IsAddDefault = base.ParmJObj.GetInt("IsAddDefault");
             var query = new RB_Class_ViewModel()
             {
-                CouseId = base.ParmJObj.GetInt("CourseId"),
+                CouseId = base.ParmJObj.GetInt("CourseId",0),
                 IsQuerySurplus = base.ParmJObj.GetInt("IsQuerySurplus"),
+                School_Id = base.ParmJObj.GetInt("SchoolId",-1),
+                MoreStatus=base.ParmJObj.GetStringValue("MoreStatus"),
                 Teacher_Id=base.ParmJObj.GetInt("Teacher_Id"),
-                IsQuerySurplusPlan=base.ParmJObj.GetInt("IsQuerySurplusPlan"),
+                IsQuerySurplusPlan=base.ParmJObj.GetInt("IsQuerySurplusPlan")
             };
             query.Group_Id = base.UserInfo.Group_Id;
-            query.School_Id = base.UserInfo.School_Id;
+            //if (query.School_Id == -1)
+            //{
+            //    query.School_Id = base.UserInfo.School_Id;
+            //}
             var list = classModule.GetClassListModule(query);
 
             List<object> result = new List<object>();