页面修改

Edu.Common/Data/XlsQuestionHelper.cs

@@ -5,8 +5,16 @@ using System.Text;
 
 namespace Edu.Common.Data
 {
-    public class XlsQuestionHelper
+    /// <summary>
+    /// 导入问题帮助类
+    /// </summary>
+    public class QuestionHelper
     {
+        /// <summary>
+        /// 根据Excel文件获取问题列表
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <returns></returns>
         public static List<XlsItem> GetXlsQuestionData(string filePath)
         {
             List<XlsItem> xlsItems = new List<XlsItem>();

Edu.Common/Plugin/ConvertHelper.cs

@@ -198,6 +198,21 @@ namespace Edu.Common
         {
             return Regex.IsMatch(StrSource, @"^((20|21|22|23|[0-1]?\d):[0-5]?\d:[0-5]?\d)$");
         }
+
+        /// <summary>
+        /// 获取英文字母
+        /// </summary>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        public static string GetEnChar(int index)
+        {
+            string[] tempArray = { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
+            if (index < tempArray.Length)
+            {
+                return tempArray[index];
+            }
+            return "";
+        }
     }
 
 }
\ No newline at end of file

Edu.Repository/User/RB_AccountRepository.cs

@@ -215,6 +215,7 @@ WHERE 1=1 {1}
             StringBuilder wheremanager = new StringBuilder();
             StringBuilder whereteacher = new StringBuilder();
             StringBuilder whereassist = new StringBuilder();
+            where.AppendFormat(" AND A.{0}={1} ", nameof(Employee_ViewModel.Status), (int)DateStateEnum.Normal);
             if (query != null)
             {
                 if (query.Group_Id > 0)
@@ -346,7 +347,7 @@ FROM
               ,b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
               ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
               ,B.LeaveStatus,B.LeaveTime,B.AssistTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
-		FROM  rb_assist AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.AId AND A.AccountType=3
+		FROM  rb_assist AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.AId AND A.AccountType=3  
 		WHERE 1=1 {0} {3}
 ) 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