From dca2532f01dac86be25ad09fa9ee8035bccdca6a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 27 Nov 2021 17:11:33 +0800
Subject: [PATCH] 1.部门tree修改 2.用户查询修改 3.培训报名年龄拦截
---
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 105 insertions(+), 12 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 1298d32..b9572c0 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -101,16 +101,32 @@
<select id="selectExamPaperPage" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
SELECT
- *
+ ke.*,
+ bu.real_name realName,
+ bd.dept_name deptName
FROM
- ksxt_exam
+ ksxt_exam ke
+ left join
+ blade_user bu
+ on
+ ke.creator = bu.id
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
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}
+ and exam_name like concat('%',#{paper.examName},'%')
+ </if>
+ <if test="paper.deptId!=null and paper.deptId!=''">
+ and bd.id = #{paper.deptId}
+ </if>
+ <if test="paper.auditStatus!=null and paper.auditStatus!=''">
+ and audit_status = #{paper.auditStatus}
</if>
order by start_time desc
</select>
@@ -195,19 +211,16 @@
)
</select>
- <!--查询前缀相同的准考证数量-->
+ <!--查询是当前前缀已生成准考证号码最大的一位-->
<select id="getCandidateNoCount" resultType="java.lang.Integer">
- select count(*) from sys_training_registration
- where 1=1
- <if test="result!=null and result!=''">
- and candidate_no like concat('%', #{result},'%')
- </if>
+ select ifnull(max(0+RIGHT(candidate_no,4)),0) from sys_training_registration
+ where candidate_no like concat('%', #{result},'%')
</select>
<!--查询当前考试已报名的人员培训报名数据集合-->
<select id="getTrainList" resultType="org.springblade.modules.training.entity.TrainingRegistration">
SELECT
- str.id
+ str.id,str.user_id userId
FROM
sys_training_registration str
left join
@@ -222,6 +235,7 @@
and bu.is_train = 1
and str.is_exam = 1
and str.cancel = 1
+ and str.train_exam_id = #{id}
</select>
<!--使用考试名称匹配考试信息-->
@@ -243,9 +257,88 @@
<!--查询当前考试的报名人员数量，模拟考试-->
<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}
+ bu.is_deleted = 0 and bu.status = 1
+ and train_exam_id = #{examPaper.id}
+ </select>
+
+ <!--根据用户id查询报名信息-->
+ <select id="getApplyDetail" resultType="org.springblade.modules.apply.entity.Apply">
+ (select
+ sa.id as id
+ from
+ sys_apply sa
+ 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
+ str.id as id
+ from
+ sys_training_registration str
+ left join
+ blade_user bu
+ on
+ bu.id = str.user_id
+ where str.user_id = #{userId}
+ and bu.is_train = 1
+ and is_exam = 1
+ and str.cancel = 1
+ )
+ </select>
+
+ <!--查询当前人员当前考试的考试题目信息-->
+ <select id="getExaminationSubjectList" resultType="org.springblade.modules.exam.vo.ExamSubjectChoicesVO">
+ SELECT
+ esc.id,esc.category_id,esc.subject_name,esc.choices_type,esc.score,esc.level
+ FROM
+ exam_subject_choices esc
+ left join
+ exam_examination_subject ees
+ on
+ esc.id = ees.subject_id
+ where 1=1
+ and ees.examination_id = #{examPaper.scoreId}
+ </select>
+
+ <!--批量新增考生考题信息-->
+ <insert id="insertBatch" parameterType="java.util.List">
+ insert into exam_examination_subject
+ (examination_id,category_id,subject_id)
+ values
+ <foreach collection="list" index="index" item="item" separator=",">
+ (
+ #{item.examinationId},
+ #{item.categoryId},
+ #{item.subjectId}
+ )
+ </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>
--
Gitblit v1.9.3