调整助教查询部字段

Edu.Model/ViewModel/User/RB_Assist_ViewModel.cs

@@ -44,5 +44,20 @@ namespace Edu.Model.ViewModel.User
         /// 审核状态字符串
         /// </summary>
         public string AuditStatusStr { get { return this.AuditStatus.ToName(); } }
+
+        /// <summary>
+        /// 带班数量
+        /// </summary>
+        public int ClassCount { get; set; }
+
+        /// <summary>
+        /// 网课产品
+        /// </summary>
+        public int OnlineClassCount { get; set; }
+
+        /// <summary>
+        /// 网课订单
+        /// </summary>
+        public int OnlineOrderCount { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/User/RB_AssistRepository.cs

@@ -79,11 +79,11 @@ WHERE 1=1
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT a.*,g.GroupName,s.SName 
-FROM rb_assist AS a LEFT JOIN rb_group AS g ON a.Group_Id=g.GId
+                SELECT a.*,g.GroupName,s.SName 
+                FROM rb_assist AS a LEFT JOIN rb_group AS g ON a.Group_Id=g.GId
                      LEFT JOIN rb_school AS s ON a.School_Id=s.SId
-WHERE 1=1 
-");
+                WHERE 1=1 
+                ");
             builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Assist_ViewModel.Status), (int)DateStateEnum.Normal);
             if (query != null)
             {
@@ -118,6 +118,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Assist_ViewModel.Teacher_Id), query.Teacher_Id);
                 }
+                if (query.AuditStatus > 0) 
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Assist_ViewModel.AuditStatus), (int)query.AuditStatus);
+                }
             }
             return GetPage<RB_Assist_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/User/UserController.cs

@@ -371,7 +371,6 @@ namespace Edu.WebApi.Controllers.User
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Assist_ViewModel>(RequestParm.Msg.ToString());
             query.Group_Id = base.UserInfo.Group_Id;
-            query.School_Id = base.UserInfo.School_Id;
             var list = assistModule.GetAssistPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {