页面修

Edu.Model/ViewModel/Exam/RB_Student_Exam_Extend.cs

-using Edu.Model.Entity.Exam;
+using Edu.Common.Enum.Question;
+using Edu.Model.Entity.Exam;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -35,5 +36,9 @@ namespace Edu.Model.ViewModel.Exam
         /// </summary>
         public int ExamMinutes { get { return Common.ConvertHelper.CalcMinutes(this.StartTime, this.EndTime); } }
 
+        /// <summary>
+		/// 题库类型(见枚举)
+		/// </summary>
+		public LevelTypeEnum BankType { get; set; }
     }
 }

Edu.Module.Exam/CourseExamModule.cs

@@ -830,6 +830,33 @@ namespace Edu.Module.Exam
             return list;
         }
 
+        /// <summary>
+        /// 获取题库分类统计参与人数
+        /// </summary>
+        /// <returns></returns>
+        public List<object> GetAppBankStaticModule()
+        {
+            List<object> result = new List<object>();
+            var list = student_ExamRepository.GetStudentExamStaticRepository(new RB_Student_Exam_Extend());
+            var bankTypeList = Common.Plugin.EnumHelper.EnumToList(typeof(LevelTypeEnum)); 
+            if (bankTypeList != null && bankTypeList.Count > 0)
+            {
+                foreach (var item in bankTypeList)
+                {
+                    int joinNum = 0;
+                    var tempList = list?.Where(qitem => (int)qitem.BankType == item.Id)?.ToList();
+                    joinNum = tempList?.Count ?? 0;
+                    result.Add(new
+                    {
+                        item.Id,
+                        item.Name,
+                        JoinNum= joinNum
+                    });
+                }
+            }
+            return result;
+        }
+
         /// <summary>
         /// 获取题库分页列表
         /// </summary>
@@ -850,7 +877,7 @@ namespace Edu.Module.Exam
                 {
                     stuExamList = student_ExamRepository.GetStudentExamListRepository(new RB_Student_Exam_Extend()
                     {
-                        GroupId = query.Group_Id,
+                       // GroupId = query.Group_Id,
                         QBankIds = bankIds
                     });
                 }
@@ -865,15 +892,18 @@ namespace Edu.Module.Exam
                     int MyTimes = 0;//测评次数
                     if (tempList != null && tempList.Count > 0)
                     {
-                        var least = tempList?.OrderBy(qitem => qitem.ExamMinutes)?.FirstOrDefault();
+                        var least = tempList?.Where(qitem => !string.IsNullOrEmpty(Common.ConvertHelper.FormatTime(qitem.EndTime)))?.OrderBy(qitem => qitem.ExamMinutes)?.FirstOrDefault();
+                        if (least != null && Common.ConvertHelper.FormatTime(least.EndTime) != "" && Common.ConvertHelper.FormatTime(least.StartTime) != "")
+                        {
                             LeastTime = Common.ConvertHelper.CalcMinutesAndSeconds(least.StartTime, least.EndTime);
+                        }
                         HighestScore = tempList?.Max(qitem => qitem.Score) ?? 0;
-                        var myLast = tempList?.Where(qitem => qitem.StudentId == query.StudentId).OrderByDescending(qitem => qitem.Id)?.FirstOrDefault();
+                        var myLast = tempList?.Where(qitem => !string.IsNullOrEmpty(Common.ConvertHelper.FormatTime(qitem.EndTime)) && qitem.StudentId == query.StudentId).OrderByDescending(qitem => qitem.Id)?.FirstOrDefault();
                         if (myLast != null)
                         {
                             MyUseTime = Common.ConvertHelper.CalcMinutesAndSeconds(myLast.StartTime, myLast.EndTime);
                             MyScore = myLast.Score;
-                            MyRank = tempList?.FindIndex(qitem => qitem.StudentId == query.StudentId) ?? 0;
+                            MyRank = tempList.FindIndex(qitem => qitem.Id == myLast.Id)+1;
                         }
                         MyTimes = tempList?.Where(qitem => qitem.StudentId == query.StudentId)?.Count() ?? 0;
                     }
@@ -934,7 +964,7 @@ namespace Edu.Module.Exam
                             Common.Plugin.LogHelper.Write(ex, "GetAppQuestionCategoryListModule_listening:" + Common.Plugin.JsonHelper.Serialize(item));
                         }
                     }
-                    if (item.QuestionTypeKey != "listening" && item.QuestionTypeKey != "reading-comprehensio" && !string.IsNullOrEmpty(item.Answer.ToString()))
+                    if (item.QuestionTypeKey != "listening" && item.QuestionTypeKey != "reading-comprehensio" && !string.IsNullOrEmpty(item.Answer))
                     {
                         try
                         {
@@ -1039,7 +1069,7 @@ namespace Edu.Module.Exam
             decimal totalScore = 0;
             if (model.ExamDetailsList != null && model.ExamDetailsList.Count > 0)
             {
-                totalScore = model.ExamDetailsList.Sum(qitem => qitem.StudentScore);
+             
                 foreach (var item in model.ExamDetailsList)
                 {
                     item.ExamId = model.Id;
@@ -1099,7 +1129,9 @@ namespace Edu.Module.Exam
                 //       // flag = student_ExamDetailsRepository.BatchStudentExamDetailsRepository(tempList);
                 //    }
                 //}
+
                 flag = student_ExamDetailsRepository.BatchStudentExamDetailsRepository(model.ExamDetailsList);
+                totalScore = model.ExamDetailsList.Sum(qitem => qitem.StudentScore);
             }
             fileds.Add(nameof(RB_Student_Exam_Extend.Score), totalScore);
             flag = student_ExamRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Exam_Extend.Id), model.Id));

Edu.Repository/Exam/RB_Student_ExamRepository.cs

@@ -13,19 +13,16 @@ namespace Edu.Repository.Exam
     public class RB_Student_ExamRepository : BaseRepository<RB_Student_Exam>
     {
         /// <summary>
-        /// 获取学员练习考试分页列表
+        /// 获取学员练习考试参与人数统计
         /// </summary>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_Student_Exam_Extend> GetStudentExamPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Student_Exam_Extend query)
+        public List<RB_Student_Exam_Extend> GetStudentExamStaticRepository(RB_Student_Exam_Extend query)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.* 
-FROM RB_Student_Exam AS A
+SELECT B.BankType,A.StudentId
+FROM RB_Student_Exam AS A INNER JOIN rb_question_bank AS B ON A.BankId=B.BankId
 WHERE 1=1
 ");
             if (query != null)
@@ -47,7 +44,8 @@ WHERE 1=1
                     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();
+            builder.Append(" GROUP BY B.BankType,A.StudentId ");
+            return Get<RB_Student_Exam_Extend>(builder.ToString()).ToList();
         }
 
 

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -1061,6 +1061,17 @@ namespace Edu.WebApi.Controllers.Exam
             return ApiResult.Success(data: pageModel);
         }
 
+        /// <summary>
+        /// 获取考级题库参与人数统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppBankStatic()
+        {
+            var obj = courseExamModule.GetAppBankStaticModule();
+            return ApiResult.Success(data: obj);
+        }
+
         /// <summary>
         /// 获取考级题库分页列表
         /// </summary>