From 097a14bada17d8b2bc776ba0d97e6c67bf1eba89 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Sep 2021 10:30:49 +0800
Subject: [PATCH] 1.许可模板
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 98043cf..f6f405e 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -6,8 +6,9 @@
<select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
SELECT
sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
+ sa.examination_type examinationType,sa.examination_mx examinationMx,
ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
- bu.real_name realName,bu.is_apply isApply,
+ bu.real_name realName,bu.is_apply isApply, ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(bu.cardid,7,4),0) age,
bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
FROM
sys_apply sa
@@ -37,8 +38,11 @@
<if test="apply.userId!=null and apply.userId!=''">
and sa.user_id like concat('%', #{apply.userId},'%')
</if>
+ <if test="apply.examinationType!=null and apply.examinationType!=''">
+ and sa.examination_type = #{apply.examinationType}
+ </if>
<if test="apply.applyStatus!=null">
- and apply_status = #{apply.applyStatus}
+ and sa.exam_id is null
</if>
<if test="apply.applyExamType!=null">
and apply_exam_type = #{apply.applyExamType}
@@ -95,7 +99,7 @@
SELECT
sa.id,sa.candidate_no candidateNo,
ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName,
- bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.my_picture myPicture,
+ bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.avatar myPicture,
bd.dept_name deptName,"保安证" applyCard
FROM
sys_apply sa
@@ -121,8 +125,9 @@
select
sr.candidate_no candidateNo,
bt.dept_name AS deptName,"保安证" applyCard,
- bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.my_picture myPicture,
- ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName
+ bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.avatar myPicture,
+ ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName,
+ si.enterpriseName company,si.address
FROM
sys_training_registration sr
LEFT JOIN
@@ -141,6 +146,10 @@
ksxt_exam ke
on
ke.id = sr.train_exam_id
+ left join
+ sys_information si
+ on
+ si.departmentid = sr.training_unit_id
WHERE
1=1
and sr.id = #{apply.id}
@@ -225,6 +234,7 @@
and sa.apply_status = 2
and bu.is_apply = 1
and sa.exam_id is null
+ limit 0,#{number}
</select>
<!--查询考试人数-->
@@ -342,4 +352,9 @@
</if>
</select>
+ <!--查询报名信息，取最新的一条（即当前userId,）applyId最大的一条记录-->
+ <select id="getMaxApplyIdByUserIdInfo" resultType="org.springblade.modules.apply.entity.Apply">
+ select MAX(id) id from sys_apply where user_id = #{userId}
+ </select>
+
</mapper>
--
Gitblit v1.9.3