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 | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 5a8d281..b9572c0 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -220,7 +220,7 @@
<!--查询当前考试已报名的人员培训报名数据集合-->
<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
@@ -257,10 +257,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查询报名信息-->
@@ -298,7 +302,10 @@
<!--查询当前人员当前考试的考试题目信息-->
<select id="getExaminationSubjectList" resultType="org.springblade.modules.exam.vo.ExamSubjectChoicesVO">
- SELECT esc.* FROM exam_subject_choices esc
+ 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
@@ -321,4 +328,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