From cc3a57f2a466a76a808b8171fdcfa5d10263e4eb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 Jan 2022 14:42:50 +0800
Subject: [PATCH] 1.考试查询修改 2.新增登录情况导出 3.题库查询修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml | 126 +++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 33 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 a1e2cb4..6478a01 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -103,7 +103,8 @@
SELECT
ke.*,
bu.real_name realName,
- bd.dept_name deptName
+ bd.dept_name deptName,
+ bu1.real_name confirmUserName
FROM
ksxt_exam ke
left join
@@ -114,6 +115,10 @@
blade_dept bd
on
bd.id = bu.dept_id
+ left join
+ blade_user bu1
+ on
+ ke.confirm_user = bu1.id
where
1=1
<if test="paper.examType!=null and paper.examType!=''">
@@ -125,10 +130,16 @@
<if test="paper.deptId!=null and paper.deptId!=''">
and bd.id = #{paper.deptId}
</if>
+ <if test="paper.deptName!=null and paper.deptName!=''">
+ and bd.dept_name like concat('%',#{paper.deptName},'%')
+ </if>
+ <if test="paper.examTime!=null and paper.examTime!=''">
+ and date_format(ke.start_time,'%Y-%m-%d') = #{paper.examTime}
+ </if>
<if test="paper.auditStatus!=null and paper.auditStatus!=''">
and audit_status = #{paper.auditStatus}
</if>
- order by start_time desc
+ order by ke.start_time desc,ke.id desc
</select>
<select id="PagerSubject" resultMap="PagerSubjectAnswer">
@@ -165,33 +176,59 @@
</delete>
<!--查询考试人员考试信息-->
+<!-- <select id="getExamDetail" resultType="org.springblade.modules.exam.vo.ExamPaperVO">-->
+<!-- (select-->
+<!-- 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-->
+<!-- ksxt_exam ke-->
+<!-- left join-->
+<!-- sys_apply sa-->
+<!-- on-->
+<!-- sa.exam_id = ke.id-->
+<!-- left join-->
+<!-- blade_user bu-->
+<!-- on-->
+<!-- bu.id = sa.user_id-->
+<!-- where sa.user_id = #{userId}-->
+<!-- and is_apply = 1-->
+<!-- and is_exam = 1-->
+<!-- and sa.apply_status = 2-->
+<!-- )-->
+
+<!-- union all-->
+
+<!-- (select-->
+<!-- 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-->
+<!-- ksxt_exam ke-->
+<!-- left join-->
+<!-- sys_training_registration str-->
+<!-- on-->
+<!-- str.train_exam_id = ke.id-->
+<!-- left join-->
+<!-- blade_user bu-->
+<!-- on-->
+<!-- bu.id = str.user_id-->
+<!-- where str.user_id = #{userId}-->
+<!-- and bu.is_train = 1-->
+<!-- and (str.is_exam = 1 or str.is_exam = 3)-->
+<!-- and ke.audit_status = 1-->
+<!-- and str.cancel = 1-->
+<!-- and str.audit_status = 1-->
+<!-- )-->
+<!-- </select> 、-->
+
+ <!--查询考试人员考试信息-->
<select id="getExamDetail" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
- (select
+ select
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
- ksxt_exam ke
- left join
- sys_apply sa
- on
- sa.exam_id = ke.id
- left join
- blade_user bu
- on
- bu.id = sa.user_id
- where sa.user_id = #{userId}
- and is_apply = 1
- and is_exam = 1
- and sa.apply_status = 2
- )
-
- union all
-
- (select
- 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
+ str.candidate_no candidateNo,str.id applyId,str.is_exam isExam,
+ bu.real_name realName,bu.sex,bu.cardid idCardNo,
+ es.exam_time examStartTime,es.id scoreId
from
ksxt_exam ke
left join
@@ -202,13 +239,18 @@
blade_user bu
on
bu.id = str.user_id
- where str.user_id = #{userId}
+ left join
+ exam_score es
+ on
+ es.apply_id = str.id
+ where str.user_id = #{examPaper.userId}
and bu.is_train = 1
- and is_exam = 1
+ and (str.is_exam = 1 or str.is_exam = 3)
and ke.audit_status = 1
and str.cancel = 1
and str.audit_status = 1
- )
+ and ke.start_time <= now() and ke.end_time > now()
+ order by str.id desc
</select>
<!--查询是当前前缀已生成准考证号码最大的一位-->
@@ -257,10 +299,14 @@
<!--查询当前考试的报名人员数量，模拟考试-->
<select id="getTrainNumber" resultType="java.lang.Integer">
- select count(*) from sys_training_registration
+ select count(*) from sys_training_registration str
+ left join
+ blade_user bu
+ on
+ bu.id = str.user_id
where
- train_exam_id = #{examPaper.id}
- and cancel = 1
+ bu.is_deleted = 0 and bu.status = 1
+ and train_exam_id = #{examPaper.id}
</select>
<!--根据用户id查询报名信息-->
@@ -324,4 +370,18 @@
</foreach>
</insert>
+ <!--查询当前考试的报名人员数量，模拟考试-->
+ <select id="getExamNumber" resultType="java.lang.Integer">
+ select count(*) from sys_training_registration str
+ left join
+ blade_user bu
+ on
+ bu.id = str.user_id
+ where
+ bu.is_deleted = 0 and bu.status = 1
+ and train_exam_id = #{examPaper.id}
+ and (is_exam = 2 or is_exam = 3)
+ and cancel = 1
+ </select>
+
</mapper>
--
Gitblit v1.9.3