From 0af331c7df1f4e3365b3cb5abd60eaaa09807513 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 16 Sep 2021 09:01:41 +0800
Subject: [PATCH] 1.社保
---
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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 4598bfe..fabc4e8 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -112,6 +112,7 @@
<if test="paper.examName!=null and paper.examName!=''">
and exam_name = #{paper.examName}
</if>
+ order by start_time desc
</select>
<select id="PagerSubject" resultMap="PagerSubjectAnswer">
@@ -150,7 +151,7 @@
<!--查询考试人员考试信息-->
<select id="getExamDetail" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
(select
- ke.id,ke.exam_name examName,ke.start_time startTime,ke.exam_type examType,
+ ke.id,ke.exam_name examName,ke.start_time startTime,ke.end_time endTime,ke.exam_type examType,
sa.candidate_no candidateNo,sa.id applyId,
bu.real_name realName,bu.sex,bu.cardid idCardNo
from
@@ -172,7 +173,7 @@
union all
(select
- ke.id,ke.exam_name examName,ke.start_time startTime,ke.exam_type examType,
+ ke.id,ke.exam_name examName,ke.start_time startTime,ke.end_time endTime,ke.exam_type examType,
str.candidate_no candidateNo,str.id applyId,
bu.real_name realName,bu.sex,bu.cardid idCardNo
from
@@ -248,4 +249,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