页面修改

Edu.Model/ViewModel/Exam/RB_Examination_Publish_ViewModel.cs

@@ -81,5 +81,20 @@ namespace Edu.Model.ViewModel.Exam
         /// 账号编号
         /// </summary>
         public string QAccountIds { get; set; }
+
+        /// <summary>
+        /// 查询考试状态【1-未开始,2-进行中,3-已结束】
+        /// </summary>
+        public int QTestStatus { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string QStartTime { get; set; }
+
+        /// <summary>
+        /// 结束试卷
+        /// </summary>
+        public string QEndTime { get; set; }
     }
 }

Edu.Repository/Exam/RB_Examination_PublishRepository.cs

@@ -48,6 +48,35 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Examination_Publish_ViewModel.CreateBy), query.CreateBy);
                 }
+                if (!string.IsNullOrEmpty(query.QStartTime))
+                {
+                    builder.AppendFormat(@" AND A.{0}>='{1}' ",nameof(RB_Examination_Publish_ViewModel.ExamStartTime),query.QStartTime);
+                }
+                if (!string.IsNullOrEmpty(query.QEndTime))
+                {
+                    builder.AppendFormat(@" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Examination_Publish_ViewModel.ExamEndTime), query.QEndTime);
+                }
+                if (query.QTestStatus > 0)
+                {
+                    //未开始
+                    if (query.QTestStatus == 1)
+                    {
+                        builder.AppendFormat(" AND A.{0}>'{1}' ", nameof(RB_Examination_Publish_ViewModel.ExamStartTime), Common.ConvertHelper.FormatTime(DateTime.Now));
+                    }
+                    //进行中
+                    if (query.QTestStatus == 2)
+                    {
+                        builder.AppendFormat(" AND A.{0}<='{1}' AND '{1}'<=A.{2} ", nameof(RB_Examination_Publish_ViewModel.ExamStartTime)
+                            ,Common.ConvertHelper.FormatTime(DateTime.Now)
+                            ,nameof(RB_Examination_Publish_ViewModel.ExamEndTime)
+                            );
+                    }
+                    //已结束
+                    if (query.QTestStatus == 3)
+                    {
+                        builder.AppendFormat(" AND A.{0}<'{1}' ", nameof(RB_Examination_Publish_ViewModel.ExamEndTime), Common.ConvertHelper.FormatTime(DateTime.Now));
+                    }
+                }
             }
             builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Examination_Publish_ViewModel.Id));
             return GetPage<RB_Examination_Publish_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -566,6 +566,9 @@ namespace Edu.WebApi.Controllers.Exam
                 PaperId = base.ParmJObj.GetInt("PaperId"),
                 PaperName = base.ParmJObj.GetStringValue("PaperName"),
                 IsQueryAll=base.ParmJObj.GetInt("IsQueryAll"),
+                QTestStatus=base.ParmJObj.GetInt("QTestStatus"),
+                QStartTime=base.ParmJObj.GetStringValue("QStartTime"),
+                QEndTime=base.ParmJObj.GetStringValue("QEndTime"),
             };
             if (query.IsQueryAll != 1)
             {
@@ -576,6 +579,24 @@ namespace Edu.WebApi.Controllers.Exam
             var list = paperModule.GetExaminationPublishPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {
+                string TestStatusStr = "未开始";
+                var startTime = Convert.ToDateTime(item.ExamStartTime);
+                var endTime = Convert.ToDateTime(item.ExamEndTime);
+                //未开始
+                if (startTime > DateTime.Now)
+                {
+                    TestStatusStr = "未开始";
+                }
+                //进行中
+                else if (startTime <= DateTime.Now && DateTime.Now <= endTime)
+                {
+                    TestStatusStr = "进行中";
+                }
+                //已结束
+                else if (endTime < DateTime.Now)
+                {
+                    TestStatusStr = "已结束";
+                }
                 var obj = new
                 {
                     item.Id,
@@ -590,6 +611,7 @@ namespace Edu.WebApi.Controllers.Exam
                     ReviewerName = item.Reviewer > 0 ? (UserReidsCache.GetUserLoginInfo(item.Reviewer)?.AccountName ?? "") : "",
                     item.Reviewer,
                     item.ExamineStatus,
+                    TestStatusStr,
                     ExamineStatusStr = paperModule.GetExamineStatusStr(item.ExamineStatus)
                 };
                 result.Add(obj);