页面修改

Edu.Model/ViewModel/Exam/RB_Student_Exam_Extend.cs

@@ -10,9 +10,30 @@ namespace Edu.Model.ViewModel.Exam
     /// </summary>
     public class RB_Student_Exam_Extend : RB_Student_Exam
     {
+        /// <summary>
+        /// 题库编号【查询使用】
+        /// </summary>
+        public string QBankIds { get; set; }
+
         /// <summary>
         /// 学员考试详情列表
         /// </summary>
         public List<RB_Student_ExamDetails_Extend> ExamDetailsList { get; set; }
+
+        /// <summary>
+        /// 开始时间字符串
+        /// </summary>
+        public string StartTimeStr { get { return Common.ConvertHelper.FormatTime(this.StartTime); } }
+
+        /// <summary>
+        /// 结束时间字符串
+        /// </summary>
+        public string EndTimeStr { get { return Common.ConvertHelper.FormatTime(this.EndTime); } }
+
+        /// <summary>
+        /// 相差分钟数
+        /// </summary>
+        public int ExamMinutes { get { return Common.ConvertHelper.CalcMinutes(this.StartTime, this.EndTime); } }
+
     }
 }

Edu.Module.Exam/CourseExamModule.cs

@@ -65,6 +65,16 @@ namespace Edu.Module.Exam
         /// </summary>
         private readonly RB_Student_PracticeRepository student_PracticeRepository = new RB_Student_PracticeRepository();
 
+        /// <summary>
+        /// 学员练习考试仓储层对象
+        /// </summary>
+        private readonly RB_Student_ExamRepository student_ExamRepository = new RB_Student_ExamRepository();
+
+        /// <summary>
+        /// 学员练习考试详情仓储层对象
+        /// </summary>
+        private readonly RB_Student_ExamDetailsRepository student_ExamDetailsRepository = new RB_Student_ExamDetailsRepository();
+
         #region 单词测试和复习
         /// <summary>
         /// 生成课程复习和预习单词
@@ -823,14 +833,31 @@ namespace Edu.Module.Exam
             var bankList = question_BankRepository.GetQuestionBankPageListRepository(pageIndex, pageSize, out rowsCount, query);
             if (bankList != null && bankList.Count > 0)
             {
+                string bankIds = string.Join(",", bankList.Select(qitem => qitem.BankId));
+                List<RB_Student_Exam_Extend> stuExamList = new List<RB_Student_Exam_Extend>();
+                if (!string.IsNullOrEmpty(bankIds))
+                {
+                    stuExamList= student_ExamRepository.GetStudentExamListRepository(new RB_Student_Exam_Extend()
+                    {
+                        GroupId = query.Group_Id,
+                        QBankIds = bankIds
+                    });
+                }
                 foreach (var item in bankList)
                 {
+                    var tempList = stuExamList?.Where(qitem => qitem.BankId == item.BankId)?.ToList();
+                    string LeastTime = "";
+                    if (tempList != null)
+                    {
+                        var least = tempList?.OrderBy(qitem => qitem.ExamMinutes)?.FirstOrDefault();
+
+                    }
                     var obj = new
                     {
                         item.BankId,
                         item.BankName,
-                        JoinNum = new Random().Next(1, 100),
-                        LeastTime = "30:55",
+                        JoinNum = tempList?.Count(),
+                        LeastTime,
                         HighestScore = new Random().Next(1, 100),
                         MyUseTime = "55:55",
                         MyScore = new Random().Next(1, 100),

Edu.Module.User/EmployeeModule.cs

@@ -221,6 +221,7 @@ namespace Edu.Module.User
                         Password=extModel.Password,
                         Token = token,
                         UserRole = extModel.UserRole,
+                        AuditStatus= Common.Enum.User.AccountStatusEnum.Pass,
                     });
                     break;
                 case Common.Enum.User.AccountTypeEnum.Assist:
@@ -250,7 +251,8 @@ namespace Edu.Module.User
                         DirectSupervisor=extModel.DirectSupervisor,
                         AssistAccount=extModel.Account,
                         Password=extModel.Password,
-                        Token = token
+                        Token = token,
+                        AuditStatus= Common.Enum.User.AccountStatusEnum.Pass,
                     });
                     break;
             }

Edu.Repository/Exam/RB_Student_ExamRepository.cs

@@ -38,6 +38,14 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Student_Exam_Extend.StudentId), query.StudentId);
                 }
+                if (query.BankId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Student_Exam_Extend.BankId), query.BankId);
+                }
+                if (!string.IsNullOrEmpty(query.QBankIds))
+                {
+                    builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Student_Exam_Extend.BankId), query.QBankIds);
+                }
             }
             return GetPage<RB_Student_Exam_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
@@ -66,6 +74,14 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Student_Exam_Extend.StudentId), query.StudentId);
                 }
+                if (query.BankId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Student_Exam_Extend.BankId), query.BankId);
+                }
+                if (!string.IsNullOrEmpty(query.QBankIds))
+                {
+                    builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Student_Exam_Extend.BankId), query.QBankIds);
+                }
             }
             return Get<RB_Student_Exam_Extend>(builder.ToString()).ToList();
         }