From bcd8b3b7e8ef8ca9079b53f316d1973308e3e457 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 15:48:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w
---
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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 50b97f4..67650ba 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -136,7 +136,7 @@
(select
ke.id,ke.exam_name examName,
sa.candidate_no candidateNo,
- bu.real_name realName,bu.sex
+ bu.real_name realName,bu.sex,bu.cardid idCardNo
from
ksxt_exam ke
left join
@@ -148,6 +148,7 @@
on
bu.id = sa.user_id
where sa.user_id = #{userId}
+ and is_apply = 1
and is_exam = 1
and sa.apply_status = 2
)
@@ -157,7 +158,7 @@
(select
ke.id,ke.exam_name examName,
str.candidate_no candidateNo,
- bu.real_name realName,bu.sex
+ bu.real_name realName,bu.sex,bu.cardid idCardNo
from
ksxt_exam ke
left join
@@ -169,9 +170,49 @@
on
bu.id = str.user_id
where str.user_id = #{userId}
+ and bu.is_train = 1
and is_exam = 1
- and str.cancel = 3
+ and ke.audit_status = 1
+ and str.cancel = 1
)
</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>
+
+ <!--查询当前考试已报名的人员培训报名数据集合-->
+ <select id="getTrainList" resultType="org.springblade.modules.training.entity.TrainingRegistration">
+ SELECT
+ str.id
+ FROM
+ sys_training_registration str
+ left join
+ ksxt_exam ke
+ on
+ ke.id = str.train_exam_id
+ left join
+ blade_user bu
+ on
+ bu.id = str.user_id
+ where 1=1
+ and bu.is_train = 1
+ and str.is_exam = 1
+ and str.cancel = 1
+ </select>
+
+ <!--使用考试名称匹配考试信息-->
+ <select id="getExamInfoByExamName" resultType="org.springblade.modules.exam.entity.ExamPaper">
+ SELECT
+ *
+ FROM
+ ksxt_exam
+ where exam_name like concat('%', #{examName},'%')
+ </select>
+
</mapper>
--
Gitblit v1.9.3