查询修改

Edu.Model/ViewModel/Exam/RB_Examination_Paper_ViewModel.cs

@@ -44,5 +44,20 @@ namespace Edu.Model.ViewModel.Exam
         /// 是否是试卷管理员
         /// </summary>
         public int IsPaperManager { get; set; }
+
+        /// <summary>
+        /// 查询开始时间
+        /// </summary>
+        public string QStartTime { get; set; }
+
+        /// <summary>
+        /// 查询结束试卷
+        /// </summary>
+        public string QEndTime { get; set; }
+
+        /// <summary>
+        /// 审核状态【0-草稿，1-审核中,2-正常,3-驳回，4-作废】
+        /// </summary>
+        public int QExamineStatus { get; set; }
     }
 }

Edu.Repository/Exam/RB_Examination_PaperRepository.cs

@@ -43,7 +43,6 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0} LIKE @PaperName ", nameof(RB_Examination_Paper_ViewModel.PaperName));
                     parameters.Add("PaperName", "%" + query.PaperName.Trim() + "%");
                 }
-              
                 if (query.PaperId > 0)
                 {
                     builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.PaperId), query.PaperId);
@@ -52,6 +51,31 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Examination_Paper_ViewModel.PaperId), query.QPaperIds);
                 }
+                if (!string.IsNullOrEmpty(query.QStartTime))
+                {
+                    builder.AppendFormat(@" AND A.{0}>='{1}' ", nameof(RB_Examination_Paper_ViewModel.CreateTime), query.QStartTime);
+                }
+                if (!string.IsNullOrEmpty(query.QEndTime))
+                {
+                    builder.AppendFormat(@" AND A.{0}>='{1} 23:59:59' ", nameof(RB_Examination_Paper_ViewModel.CreateTime), query.QEndTime);
+                }
+                //if (query.QExamineStatus > -1)
+                //{
+                //    //正常
+                //    if (query.QExamineStatus == 2)
+                //    {
+                //        builder.AppendFormat(@" AND A.{0} IN(2,5) ", nameof(RB_Examination_Paper_ViewModel.ExamineStatus));
+                //    }
+                //    //驳回
+                //    else if (query.QExamineStatus == 3)
+                //    {
+                //        builder.AppendFormat(@" AND A.{0} IN(3,4) ", nameof(RB_Examination_Paper_ViewModel.ExamineStatus));
+                //    }
+                //    else
+                //    {
+                //        builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.ExamineStatus), query.QExamineStatus);
+                //    }
+                //}
                 //试卷管理员
                 if (query.IsPaperManager == 1)
                 {
@@ -76,15 +100,11 @@ WHERE 1=1
                         {
                             builder.AppendFormat(@" AND 
                                 (  
-                                    (A.{0}={1} AND A.ParentId=0) 
-                                 OR ( A.IsOpen=2 AND A.{0}<>{1})
+                                    (A.{0}={1}  AND A.ParentId=0) 
+                                 OR (A.{0}<>{1} AND A.IsOpen=2 )
                                 ) ", nameof(RB_Examination_Paper_ViewModel.CreateBy), query.CreateBy);
                         }
                     }
-                    //else
-                    //{
-                    //    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.ParentId), 0);
-                    //}
                 }
             }
             builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Examination_Paper_ViewModel.PaperId));

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -56,8 +56,15 @@ namespace Edu.WebApi.Controllers.Exam
                 PaperName = base.ParmJObj.GetStringValue("PaperName"),
                 PaperId = base.ParmJObj.GetInt("PaperId"),
                 ParentId = base.ParmJObj.GetInt("ParentId"),
-                QPaperIds = base.ParmJObj.GetStringValue("QPaperIds")
+                QPaperIds = base.ParmJObj.GetStringValue("QPaperIds"),
+                QStartTime = base.ParmJObj.GetStringValue("QStartTime"),
+                QEndTime=base.ParmJObj.GetStringValue("QEndTime"),
+                QExamineStatus=-1,
             };
+            if (!string.IsNullOrEmpty(base.ParmJObj.GetStringValue("QExamineStatus")))
+            {
+                query.QExamineStatus = base.ParmJObj.GetInt("QExamineStatus");
+            }
             query.Group_Id = base.UserInfo.Group_Id;
             //不是试卷管理员
             if (!base.CheckUserActionAuth("Paper_Manager"))
@@ -65,7 +72,8 @@ namespace Edu.WebApi.Controllers.Exam
                 query.IsPaperManager = 0;
                 query.CreateBy = base.UserInfo.Id;
             }
-            else {
+            else
+            {
                 query.IsPaperManager = 1;
             }
             List<object> result = new List<object>();