From 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 11:05:44 +0800
Subject: [PATCH] 1.许可审批
---
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml | 26 +++++++++++++++++++-------
1 files changed, 19 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 8bacda6..f35aa03 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -134,9 +134,9 @@
<!--查询考试人员考试信息-->
<select id="getExamDetail" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
(select
- ke.id,ke.exam_name examName,
- sa.candidate_no candidateNo,
- bu.real_name realName,bu.sex
+ ke.id,ke.exam_name examName,ke.exam_type examType,
+ sa.candidate_no candidateNo,sa.id applyId,
+ 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
)
@@ -155,9 +156,9 @@
union all
(select
- ke.id,ke.exam_name examName,
- str.candidate_no candidateNo,
- bu.real_name realName,bu.sex
+ ke.id,ke.exam_name examName,ke.exam_type examType,
+ str.candidate_no candidateNo,str.id applyId,
+ bu.real_name realName,bu.sex,bu.cardid idCardNo
from
ksxt_exam ke
left join
@@ -169,8 +170,10 @@
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>
@@ -203,4 +206,13 @@
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