页面修改

Edu.Module.User/AssistModule.cs

@@ -65,7 +65,6 @@ namespace Edu.Module.User
                 {
                     {nameof(RB_Assist.School_Id),model.School_Id },
                     {nameof(RB_Assist.Teacher_Id),model.Teacher_Id },
-                    {nameof(RB_Assist.Teacher_Id),model.Teacher_Id },
                     {nameof(RB_Assist.AssistName),model.AssistName.Trim() },
                     {nameof(RB_Assist.AssistTel),model.AssistTel },
                     {nameof(RB_Assist.AssistIcon),model.AssistIcon },
@@ -109,6 +108,21 @@ namespace Edu.Module.User
             return flag;
         }
 
+        /// <summary>
+        /// 助教重新申请
+        /// </summary>
+        /// <param name="AId"></param>
+        /// <returns></returns>
+        public bool ReApplyAssistModule(object AId)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Assist.AuditStatus),(int)AccountStatusEnum.Normal },
+            };
+            bool flag = assistRepository.Update(fileds, new WhereHelper(nameof(RB_Assist.AId), AId));
+            return flag;
+        }
+
         /// <summary>
         /// 讲师审核
         /// </summary>

Edu.Repository/User/RB_AssistRepository.cs

 using Edu.Common.Enum;
+using Edu.Common.Enum.User;
 using Edu.Model.ViewModel.User;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,6 +29,7 @@ FROM rb_assist AS a LEFT JOIN rb_group AS g ON a.Group_Id=g.GId
 WHERE 1=1 
 ");
             builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Assist_ViewModel.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Assist_ViewModel.AuditStatus), (int)AccountStatusEnum.Pass);
             if (query != null)
             {
                 if (!string.IsNullOrWhiteSpace(query.AssistName))
@@ -49,10 +51,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Assist_ViewModel.AId), query.AId);
                 }
-                if (query.School_Id > 0)
-                {
-                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Assist_ViewModel.School_Id), query.School_Id);
-                }
+                //if (query.School_Id > 0)
+                //{
+                //    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Assist_ViewModel.School_Id), query.School_Id);
+                //}
                 if (query.Group_Id > 0)
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Assist_ViewModel.Group_Id), query.Group_Id);

Edu.Repository/User/RB_TeacherRepository.cs

 using Edu.Common.Enum;
+using Edu.Common.Enum.User;
 using Edu.Model.ViewModel.User;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,16 +29,17 @@ FROM rb_teacher AS t LEFT JOIN rb_group AS g ON t.Group_Id=g.GId
 WHERE 1=1 
 ");
             builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.AuditStatus), (int)AccountStatusEnum.Pass);
             if (query != null)
             {
                 if (query.Group_Id > 0)
                 {
                     builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.Group_Id), query.Group_Id);
                 }
-                if (query.School_Id > 0)
-                {
-                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.School_Id), query.School_Id);
-                }
+                //if (query.School_Id > 0)
+                //{
+                //    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.School_Id), query.School_Id);
+                //}
                 if (!string.IsNullOrWhiteSpace(query.TeacherName))
                 {
                     builder.AppendFormat(" AND t.{0} LIKE @TeacherName ", nameof(RB_Teacher_ViewModel.TeacherName));

Edu.WebApi/Controllers/User/UserController.cs

@@ -456,6 +456,18 @@ namespace Edu.WebApi.Controllers.User
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 助教重新申请
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult ReApplyAssist()
+        {
+            var AId = base.ParmJObj.GetInt("AId", 0);
+            var flag = assistModule.ReApplyAssistModule(AId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         /// <summary>
         /// 助教审核
         /// </summary>