From 0dee81f06575d115d64adde8fc3a4ea94607f9ef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 Aug 2021 11:44:17 +0800
Subject: [PATCH] 1.考试报名新增判断，同一人，同一场考试，已报名且未考试，审核通过和待审核的不能再次报名 2.考试接口修改
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
index d67ad2c..38f60b0 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -5,7 +5,7 @@
<!--考试报名分页信息-->
<select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
SELECT
- sa.id,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
+ sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
bu.real_name name,sa.examination_type,sa.examination_mx,
bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
@@ -25,6 +25,7 @@
bd.id = bu.dept_id
WHERE
1=1
+ and is_exam = 1
<if test="apply.name!=null and apply.name!=''">
and sa.name like concat('%', #{apply.name},'%')
</if>
@@ -48,7 +49,7 @@
<!--考试报名详情信息-->
<select id="selectApplyInfo" resultType="org.springblade.modules.apply.vo.ApplyVO">
SELECT
- sa.id,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
+ sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
bu.real_name name,sa.examination_type,sa.examination_mx,
bd.dept_name deptName
@@ -166,6 +167,7 @@
bd.id = bu.dept_id
WHERE
1=1
+ and is_exam = 1
<if test="apply.name!=null and apply.name!=''">
and sa.name like concat('%', #{apply.name},'%')
</if>
@@ -182,4 +184,16 @@
and sa.exam_id = #{apply.examId}
</if>
</select>
+
+
+ <!--查询人员是否已经报名-->
+ <select id="getIsApply" resultType="java.lang.Integer">
+ select 1 from sys_apply
+ where 1=1
+ and is_exam = 1
+ and user_id = #{apply.userId}
+ and exam_id = #{apply.examId}
+ and (apply_status = 1 or apply_status = 2)
+ limit 1
+ </select>
</mapper>
--
Gitblit v1.9.3