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

Edu.Model/Entity/Course/RB_Order_Guest.cs

@@ -120,5 +120,10 @@ namespace Edu.Model.Entity.Course
         /// 更新时间
         /// </summary>
         public DateTime UpdateTime { get; set; }
+
+        /// <summary>
+        /// 退课备注
+        /// </summary>
+        public string DropOutRemark { get; set; }
     }
 }

Edu.Model/ViewModel/User/Employee_ViewModel.cs

@@ -151,5 +151,10 @@ namespace Edu.Model.ViewModel.User
         /// 身份证
         /// </summary>
         public string IDCard { get; set; }
+
+        /// <summary>
+        /// 行政备注
+        /// </summary>
+        public string AccountRemark { get; set; }
     }
 }

Edu.Repository/User/RB_AccountRepository.cs

@@ -297,7 +297,7 @@ FROM
 
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.Id,A.Account,A.AccountId,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.IDCard,A.Sex,A.Education,A.EntryTime,A.Address,A.BirthDate
+SELECT ar.AccountRemark,A.Id,A.Account,A.AccountId,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.IDCard,A.Sex,A.Education,A.EntryTime,A.Address,A.BirthDate
       ,A.LeaveStatus,A.LeaveTime,A.EmployeeTel,A.AccountType
       ,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName
       ,IFNULL(d.DeptId,0) AS Dept_Id,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostId,0) AS Post_Id, IFNULL(p.PostName,'') AS PostName
@@ -330,7 +330,9 @@ b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.D
 ) 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
        LEFT JOIN rb_department AS d ON A.Dept_Id=d.DeptId
-       LEFT JOIN rb_post AS p ON A.Post_Id=p.PostId     
+       LEFT JOIN rb_post AS p ON A.Post_Id=p.PostId   
+LEFT JOIN (SELECT AccountId,AccountType,MAX(Content) as AccountRemark from rb_accountremark where Group_Id=100000 and `Status`=0 GROUP BY AccountId,AccountType ORDER BY CreateTime desc)
+as ar on a.AccountId=ar.AccountId and  A.AccountType=ar.AccountType
 WHERE  1=1   {4}
 ", where.ToString(), wheremanager.ToString(), whereteacher.ToString(), whereassist.ToString(), where2.ToString());
             return builder.ToString();

Edu.WebApi/Controllers/User/UserController.cs

@@ -662,6 +662,7 @@ namespace Edu.WebApi.Controllers.User
                 qitem.School_Id,
                 qitem.Group_Id,
                 qitem.Dept_Id,
+                qitem.AccountRemark
             });
             return ApiResult.Success(data: pageModel);
         }
@@ -859,8 +860,8 @@ namespace Edu.WebApi.Controllers.User
         {
             int type = base.ParmJObj.GetInt("Type", 0);
             var list = EnumHelper.EnumToList(typeof(RemarkTypeEnum));
-           
-                return ApiResult.Success("", list);
+
+            return ApiResult.Success("", list);
 
         }