新增接口

Edu.Common/Config.cs

@@ -12,7 +12,6 @@ namespace Edu.Common
     /// </summary>
     public class Config
     {
-       
         /// <summary>
         /// 配置文件注入
         /// </summary>
@@ -31,8 +30,6 @@ namespace Edu.Common
             }
         }
 
-   
-
         /// <summary>
         /// 获取连接字符串
         /// </summary>
@@ -75,7 +72,7 @@ namespace Edu.Common
             }
             return valueStr;
         }
-        
+
         /// <summary>
         /// 获取配置
         /// </summary>
@@ -296,12 +293,21 @@ namespace Edu.Common
         /// <summary>
         /// App支付路径
         /// </summary>
-       public static string APPPay
+        public static string APPPay
         {
             get
             {
                 return "";
             }
         }
+
+        /// <summary>
+        /// 默认密码
+        /// </summary>
+        public static string DefaultPwd
+        {
+            get { return "123456"; }
+        }
+
     }
 }
\ No newline at end of file

Edu.Common/Enum/User/AccountStatusEnum.cs

+using Edu.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 账号状态
+    /// </summary>
+    public enum AccountStatusEnum
+    {
+        /// <summary>
+        /// 审核中
+        /// </summary>
+        [EnumField("审核中")]
+        Normal = 1,
+
+        /// <summary>
+        /// 审核通过
+        /// </summary>
+        [EnumField("审核通过")]
+        Pass = 2,
+
+        /// <summary>
+        /// 审核通过
+        /// </summary>
+        [EnumField("审核不通过")]
+        NoPass = 3
+    }
+}

Edu.Common/Enum/User/AccountTypeEnum.cs

+using Edu.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 账号类型
+    /// </summary>
+    public enum AccountTypeEnum
+    {
+        /// <summary>
+        /// 管理端
+        /// </summary>
+        [EnumField("管理端")]
+        Admin = 1,
+
+        /// <summary>
+        /// 教师端
+        /// </summary>
+        [EnumField("教师端")]
+        Teacher = 2,
+
+        /// <summary>
+        /// 助教
+        /// </summary>
+        [EnumField("助教")]
+        Assist = 3,
+
+        /// <summary>
+        /// 学生
+        /// </summary>
+        [EnumField("学生")]
+        Student = 4,
+    }
+}

Edu.Model/Entity/User/RB_Account.cs

 using Edu.Common.Enum;
+using Edu.Common.Enum.User;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -31,7 +32,7 @@ namespace Edu.Model.Entity.User
 		/// <summary>
 		/// 账号类型(1-管理端，2,-教师端，3-助教，4-学生)
 		/// </summary>
-		public int AccountType { get; set; }
+		public AccountTypeEnum AccountType { get; set; }
 
 		/// <summary>
 		/// 关联Id【1-关联rb_manager(MId),2-关联rb_teacher(TId)，3-关联rb_assist(AId)，4-关联rb_student(StuId)】

Edu.Model/Entity/User/RB_Assist.cs

 using Edu.Common.Enum;
+using Edu.Common.Enum.User;
 using System;
 using VT.FW.DB;
 
@@ -50,7 +51,7 @@ namespace Edu.Model.Entity.User
 		/// <summary>
 		/// 审核状态(1-审核中,2-审核通过,3-审核不通过)
 		/// </summary>
-		public int? AuditStatus { get; set; }
+		public AccountStatusEnum AuditStatus { get; set; }
 
 		/// <summary>
 		/// 删除状态(1-删除)

Edu.Model/Entity/User/RB_Teacher.cs

 using Edu.Common.Enum;
+using Edu.Common.Enum.User;
 using System;
 using VT.FW.DB;
 
@@ -59,7 +60,12 @@ namespace Edu.Model.Entity.User
         /// <summary>
         /// 审核状态(1-审核中,2-审核通过,3-审核不通过)
         /// </summary>
-        public int AuditStatus { get; set; }
+        public AccountStatusEnum AuditStatus { get; set; }
+
+        /// <summary>
+        /// 审核备注
+        /// </summary>
+        public string AuditRemark { get; set; }
 
         /// <summary>
         /// 显示状态(1-显示，0-隐藏)

Edu.Model/ViewModel/User/RB_Assist_ViewModel.cs

@@ -19,5 +19,25 @@ namespace Edu.Model.ViewModel.User
         /// 学校名称
         /// </summary>
         public string SName { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
+
+        /// <summary>
+        /// 更新人
+        /// </summary>
+        public string UpdateByName { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public string UpdateTimeStr { get { return Common.ConvertHelper.FormatTime(this.UpdateTime); } }
     }
 }
\ No newline at end of file

Edu.Module.User/TeacherModule.cs

-using Edu.Common.Enum;
+using Edu.AOP.CustomerAttribute;
+using Edu.Common.Enum;
+using Edu.Common.Enum.User;
+using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.User;
 using System;
@@ -14,8 +17,16 @@ namespace Edu.Module.User
     /// </summary>
     public class TeacherModule
     {
+        /// <summary>
+        /// 讲师仓储层对象
+        /// </summary>
         private readonly RB_TeacherRepository teacherRepository = new RB_TeacherRepository();
 
+        /// <summary>
+        /// 账号处理类
+        /// </summary>
+        private readonly AccountModule accountModule = new AccountModule();
+
         /// <summary>
         /// 获取讲师列表
         /// </summary>
@@ -100,5 +111,47 @@ namespace Edu.Module.User
             flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), TId));
             return flag;
         }
+
+        /// <summary>
+        /// 讲师审核
+        /// </summary>
+        /// <param name="TId">教师编号</param>
+        /// <param name="AuditStatus">审核状态</param>
+        /// <param name="AuditRemark">审核备注</param>
+        /// <param name="user">用户信息</param>
+        /// <returns></returns>
+        [TransactionCallHandler]
+        public virtual bool AuditTeacherModule(int TId,int AuditStatus,string AuditRemark, UserInfo user)
+        {
+            bool flag = false;
+            var model = GetTeacherModule(TId);
+            if (model!=null)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Teacher_ViewModel.AuditStatus),AuditStatus },
+                    {nameof(RB_Teacher_ViewModel.AuditRemark),AuditRemark },
+                };
+                flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), TId));
+                AccountStatusEnum statusEnum = (AccountStatusEnum)AuditStatus;
+                if (statusEnum == AccountStatusEnum.Pass && flag)
+                {
+                    flag = accountModule.SetAccountModule(new RB_Account_ViewModel()
+                    {
+                        Account = model.TeacherTel,
+                        Password = Common.DES.Encrypt(Common.Config.DefaultPwd),
+                        AccountType = AccountTypeEnum.Teacher,
+                        AccountId = model.TId,
+                        CreateBy = user.Id,
+                        UpdateBy = user.Id,
+                        CreateTime = DateTime.Now,
+                        UpdateTime = DateTime.Now,
+                        Group_Id = model.Group_Id,
+                        School_Id = model.School_Id,
+                    });
+                }
+            }
+            return flag;
+        }
     }
 }

Edu.WebApi/Controllers/User/LoginController.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using Edu.Cache.User;
 using Edu.Common.API;
+using Edu.Common.Enum.User;
 using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.User;
@@ -49,7 +50,7 @@ namespace Edu.WebApi.Controllers.User
             var model = accountModule.GetAccountListExtModule(new RB_Account_ViewModel()
             {
                 Account = account.Trim(),
-                AccountType = accountType
+                AccountType = (AccountTypeEnum)accountType
             })?.FirstOrDefault();
             if (model == null)
             {

Edu.WebApi/Controllers/User/UserController.cs

@@ -274,6 +274,8 @@ namespace Edu.WebApi.Controllers.User
             extModel.CreateTime = DateTime.Now;
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;
+            extModel.AuditStatus = Common.Enum.User.AccountStatusEnum.NoPass;
+            extModel.Group_Id = base.UserInfo.Group_Id;
             bool flag = teacherModule.SetTeacherModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
@@ -301,6 +303,20 @@ namespace Edu.WebApi.Controllers.User
             var flag = teacherModule.RemoveTeacherModule(TId);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+        /// <summary>
+        /// 讲师审核
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult AuditTeacher()
+        {
+            var TId = base.ParmJObj.GetInt("TId", 0);
+            int AuditStatus = base.ParmJObj.GetInt("AuditStatus", 1);
+            string AuditRemark = base.ParmJObj.GetStringValue("AuditRemark");
+            var flag = teacherModule.AuditTeacherModule(TId, AuditStatus, AuditRemark,base.UserInfo);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
         #endregion
 
         #region 助教管理
@@ -317,6 +333,17 @@ namespace Edu.WebApi.Controllers.User
             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)
+            {
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
+                if (item.UpdateBy > 0)
+                {
+                    item.UpdateByName = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.AccountName ?? "";
+                }
+            }
             pageModel.Count = rowsCount;
             pageModel.PageData = list;
             return ApiResult.Success(data: list);
@@ -348,6 +375,9 @@ namespace Edu.WebApi.Controllers.User
             extModel.CreateTime = DateTime.Now;
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;
+            extModel.Group_Id = base.UserInfo.Group_Id;
+            //extModel.School_Id = base.UserInfo.School_Id;
+            extModel.AuditStatus = Common.Enum.User.AccountStatusEnum.Normal;
             bool flag = assistModule.SetAssistModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }