From 2b7013958fc02dd1d41b780d08768636df4e5c1f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Sep 2021 14:11:25 +0800
Subject: [PATCH] 考试报名列表接口修改,考试生成修改

---
 src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
index 517bfa6..1298d32 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -85,7 +85,7 @@
         SELECT * FROM ( SELECT * FROM exam_subject_choices WHERE choices_type = 3 ORDER BY RAND( ) LIMIT 5 ) d
     </select>
 
-    <select id="selectExamPaperPage" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
+    <select id="selectExamPaperPages" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
         SELECT
             *
         FROM
@@ -96,6 +96,23 @@
                 ksxt_exam sj ) as s
         WHERE
             show = 1
+    </select>
+
+
+    <select id="selectExamPaperPage" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
+        SELECT
+            *
+        FROM
+            ksxt_exam
+        where
+        1=1
+        <if test="paper.examType!=null and paper.examType!=''">
+            and exam_type = #{paper.examType}
+        </if>
+        <if test="paper.examName!=null and paper.examName!=''">
+            and exam_name = #{paper.examName}
+        </if>
+        order by start_time desc
     </select>
 
     <select id="PagerSubject" resultMap="PagerSubjectAnswer">
@@ -134,7 +151,7 @@
     <!--查询考试人员考试信息-->
     <select id="getExamDetail" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
         (select
-            ke.id,ke.exam_name examName,ke.exam_type examType,
+            ke.id,ke.exam_name examName,ke.start_time startTime,ke.end_time endTime,ke.exam_type examType,
             sa.candidate_no candidateNo,sa.id applyId,
             bu.real_name realName,bu.sex,bu.cardid idCardNo
         from
@@ -156,7 +173,7 @@
         union all
 
         (select
-            ke.id,ke.exam_name examName,ke.exam_type examType,
+            ke.id,ke.exam_name examName,ke.start_time startTime,ke.end_time endTime,ke.exam_type examType,
             str.candidate_no candidateNo,str.id applyId,
             bu.real_name realName,bu.sex,bu.cardid idCardNo
         from
@@ -174,6 +191,7 @@
         and is_exam = 1
         and ke.audit_status = 1
         and str.cancel = 1
+        and str.audit_status = 1
         )
     </select>
 
@@ -215,4 +233,20 @@
         where exam_name like concat('%', #{examName},'%')
     </select>
 
+    <!--查询当前考试的报名人员数量-->
+    <select id="getApplyNumber" resultType="java.lang.Integer">
+        select count(*) from sys_apply
+        where
+        exam_id = #{examPaper.id}
+        and apply_status = 2
+    </select>
+
+    <!--查询当前考试的报名人员数量,模拟考试-->
+    <select id="getTrainNumber" resultType="java.lang.Integer">
+        select count(*) from sys_training_registration
+        where
+        train_exam_id = #{examPaper.id}
+        and cancel = 1
+    </select>
+
 </mapper>

--
Gitblit v1.9.3