From a9463d9118693dbb54cef0d076c03b4160ab64e4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 29 Sep 2021 14:59:20 +0800
Subject: [PATCH] 考试准考证生成修改，统计接口修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 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..84f8b7d 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -110,7 +110,10 @@
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.auditStatus!=null and paper.auditStatus!=''">
+ and audit_status = #{paper.auditStatus}
</if>
order by start_time desc
</select>
@@ -195,13 +198,10 @@
)
</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>
<!--查询当前考试已报名的人员培训报名数据集合-->
@@ -222,6 +222,7 @@
and bu.is_train = 1
and str.is_exam = 1
and str.cancel = 1
+ and str.train_exam_id = #{id}
</select>
<!--使用考试名称匹配考试信息-->
@@ -249,4 +250,37 @@
and cancel = 1
</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>
+
</mapper>
--
Gitblit v1.9.3