页面修改

Edu.Module.User/AccountModule.cs

@@ -49,7 +49,11 @@ namespace Edu.Module.User
             return accountRepository.GetAccountListExtRepository(query);
         }
 
-
+        /// <summary>
+        /// 获取学员账号信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
         public List<RB_Account_ViewModel> GetStudentExt(RB_Account_ViewModel query)
         {
             return accountRepository.GetStudentExt(query);
@@ -130,19 +134,15 @@ namespace Edu.Module.User
             return (flag, newPwd);
         }
 
-
-
         /// <summary>
         /// 重置密码
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-
         [TransactionCallHandler]
-        public bool SetBatchResetPassword(List<RB_Account_ViewModel> list, string newPwd)
+        public virtual bool SetBatchResetPassword(List<RB_Account_ViewModel> list, string newPwd)
         {
             bool flag = false;
-
             foreach (var model in list)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
@@ -166,9 +166,8 @@ namespace Edu.Module.User
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-
         [TransactionCallHandler]
-        public bool SetResetPwdAndAtatus(RB_Account_ViewModel model, string newPwd)
+        public virtual bool SetResetPwdAndAtatus(RB_Account_ViewModel model, string newPwd)
         {
             bool flag = false;
             Dictionary<string, object> fileds = new Dictionary<string, object>()
@@ -187,7 +186,6 @@ namespace Edu.Module.User
                 new WhereHelper(nameof(RB_Account_ViewModel.Group_Id), model.Group_Id)
             };
             flag = accountRepository.Update(fileds, wheres);
-
             return flag;
         }
     }

Edu.Module.Web/WebAdvisoryModule.cs

@@ -72,9 +72,8 @@ namespace Edu.Module.Web
             var query = new RB_Web_Advisory_ViewModel()
             {
                 Id = Id,
-                Status = (DateStateEnum)(-1)
             };
-            return GetWebAdvisoryPageModule(1, 1, out long rowsCount, query)?.FirstOrDefault();
+            return web_AdvisoryRepository.GetWebAdvisoryEntityRepository(query);
         }
 
         /// <summary>

Edu.Repository/User/RB_AccountRepository.cs

@@ -61,7 +61,7 @@ WHERE 1=1
         }
 
         /// <summary>
-        /// 获取账号列表扩展列表
+        /// 获取后台用户账号列表扩展列表
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
@@ -158,7 +158,11 @@ WHERE 1=1 {1}
         }
 
 
-
+        /// <summary>
+        /// 获取学员账号列表扩展列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
         public List<RB_Account_ViewModel> GetStudentExt(RB_Account_ViewModel query)
         {
             StringBuilder where = new StringBuilder();
@@ -193,21 +197,20 @@ WHERE 1=1 {1}
                 {
                     where.AppendFormat(" AND A.{0}='{1}' ", nameof(RB_Account_ViewModel.OpenId), query.OpenId);
                 }
-               
             }
-
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@"select A.*,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName,IFNULL(G.Logo,'') AS GroupLogo
-from rb_account AS A INNER JOIN rb_student AS B ON A.AccountId=B.StuId 
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName,IFNULL(G.Logo,'') AS GroupLogo
+       ,IFNULL(B.StuName,'') AS AccountName
+FROM   rb_account AS A INNER JOIN rb_student AS B ON A.AccountId=B.StuId 
        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 {0}
+       LEFT JOIN rb_school AS s ON A.School_Id=s.SId
+WHERE 1=1 {0}
 ", where.ToString());
             var list = Get<RB_Account_ViewModel>(builder.ToString()).ToList();
             return list;
-
         }
 
-
         /// <summary>
         /// 获取账户总数量
         /// </summary>
@@ -263,7 +266,6 @@ from rb_account AS A INNER JOIN rb_student AS B ON A.AccountId=B.StuId
                     where.AppendFormat(" AND B.{0} <>4 ", nameof(Employee_ViewModel.LeaveStatus));
                 }
             }
-
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT count(0)

Edu.Repository/Web/RB_Web_AdvisoryRepository.cs

@@ -72,5 +72,43 @@ WHERE 1=1
             return GetPage<RB_Web_Advisory_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 
+
+        /// <summary>
+        /// 获取咨询管理实体
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public RB_Web_Advisory_ViewModel GetWebAdvisoryEntityRepository(RB_Web_Advisory_ViewModel query)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@"
+SELECT A.* FROM
+(
+		SELECT A.*,IFNULL(B.CourseName,'') AS SourceName
+		FROM rb_web_advisory AS A INNER JOIN rb_course AS B ON (A.SourceId=B.CourseId AND A.AdvType=1)
+		UNION ALL 
+		SELECT A.*,IFNULL(B.ClassName,'') AS SourceName
+		FROM rb_web_advisory AS A INNER JOIN rb_class AS B ON  (A.SourceId=B.ClassId AND A.AdvType=2)
+		UNION ALL 
+		SELECT A.*,IFNULL(B.`Name`,'') AS SourceName
+		FROM rb_web_advisory AS A INNER JOIN rb_studyabroad AS B ON  (A.SourceId=B.Id AND A.AdvType=3)
+) AS A
+WHERE 1=1
+");
+            if (query == null)
+            {
+                return new RB_Web_Advisory_ViewModel();
+            }
+            else
+            {
+                if (query.Id > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Web_Advisory_ViewModel.Id), query.Id);
+                }
+            }
+            return Get<RB_Web_Advisory_ViewModel>(builder.ToString(), parameters)?.FirstOrDefault();
+        }
+
     }
 }
\ No newline at end of file