From 00754b2fb8e71be738e6c312e11d62e64a4e82c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Dec 2021 17:13:59 +0800
Subject: [PATCH] 1.二维码批量生成修改，新增图片批量下载 2.用户修改 rtime bug 修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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..dbd0de1 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!=''">
@@ -257,10 +262,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 +333,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