From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增，报名查询，报名清册，培训报名，培训报名查询修改
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 121 ++++++++++++++++++++++++++++++++++-----
1 files changed, 104 insertions(+), 17 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 e94e6ba..03fb3bf 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -9,6 +9,7 @@
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, ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(bu.cardid,7,4),0) age,
+ bu.sex,bu.phone,bu.nativePlace,
bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
FROM
sys_apply sa
@@ -17,7 +18,12 @@
on
sa.exam_id = ke.id
left join
- blade_user bu
+ (
+ select * from blade_user where 1=1
+ <if test="apply.deptId!=null and apply.deptId!=''">
+ and dept_id = #{apply.deptId}
+ </if>
+ ) bu
on
sa.user_id = bu.id
left join
@@ -27,8 +33,26 @@
WHERE
1=1
and is_exam = 1
- and sa.apply_status = 2
+ <if test="apply.applyStatus==2">
+ and sa.exam_id is null
and bu.is_apply = 1
+ and sa.apply_status = 2
+ </if>
+ <if test="apply.applyStatus==4">
+ and sa.apply_status = 4
+ </if>
+ <if test="apply.applyStatus==1">
+ and
+ (
+ sa.exam_id is null
+ and bu.is_apply = 1
+ and sa.apply_status = 2
+ )
+ or
+ (
+ sa.apply_status = 4
+ )
+ </if>
<if test="apply.realName!=null and apply.realName!=''">
and bu.real_name like concat('%', #{apply.realName},'%')
</if>
@@ -38,24 +62,95 @@
<if test="apply.userId!=null and apply.userId!=''">
and sa.user_id like concat('%', #{apply.userId},'%')
</if>
+ <if test="apply.idCardNo!=null and apply.idCardNo!=''">
+ and bu.cardid like concat('%', #{apply.idCardNo},'%')
+ </if>
<if test="apply.examinationType!=null and apply.examinationType!=''">
and sa.examination_type = #{apply.examinationType}
</if>
<if test="apply.deptId!=null and apply.deptId!=''">
and bu.dept_id = #{apply.deptId}
</if>
- <if test="apply.applyStatus==2">
- and exam_id is null
+ <if test="apply.applyExamType!=null">
+ and apply_exam_type = #{apply.applyExamType}
+ </if>
+ <if test="apply.examId!=null">
+ and sa.exam_id = #{apply.examId}
+ </if>
+ <if test="apply.beginTime!=null and apply.beginTime!=''">
+ and sa.apply_time >= #{apply.beginTime}
+ </if>
+ <if test="apply.overTime!=null and apply.overTime!=''">
+ and sa.apply_time <= #{apply.overTime}
+ </if>
+ </select>
+
+
+ <!--考试报名分页信息 清册-->
+ <select id="selectApplyPageStatis" 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, ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(bu.cardid,7,4),0) age,
+ bu.sex,bu.phone,bu.nativePlace,
+ bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
+ FROM
+ sys_apply sa
+ left join
+ ksxt_exam ke
+ on
+ sa.exam_id = ke.id
+ left join
+ (
+ select * from blade_user where 1=1
+ <if test="apply.deptId!=null and apply.deptId!=''">
+ and dept_id = #{apply.deptId}
+ </if>
+ ) bu
+ on
+ sa.user_id = bu.id
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ WHERE
+ 1=1
+ <if test="apply.applyStatus==3">
+ and sa.apply_status = 2
</if>
<if test="apply.applyStatus==4">
and sa.apply_status = 4
- and bu.is_apply = 2
+ </if>
+ <if test="apply.realName!=null and apply.realName!=''">
+ and bu.real_name like concat('%', #{apply.realName},'%')
+ </if>
+ <if test="apply.deptName!=null and apply.deptName!=''">
+ and bd.dept_name like concat('%', #{apply.deptName},'%')
+ </if>
+ <if test="apply.userId!=null and apply.userId!=''">
+ and sa.user_id like concat('%', #{apply.userId},'%')
+ </if>
+ <if test="apply.idCardNo!=null and apply.idCardNo!=''">
+ and bu.cardid like concat('%', #{apply.idCardNo},'%')
+ </if>
+ <if test="apply.examinationType!=null and apply.examinationType!=''">
+ and sa.examination_type = #{apply.examinationType}
+ </if>
+ <if test="apply.deptId!=null and apply.deptId!=''">
+ and bu.dept_id = #{apply.deptId}
</if>
<if test="apply.applyExamType!=null">
and apply_exam_type = #{apply.applyExamType}
</if>
<if test="apply.examId!=null">
and sa.exam_id = #{apply.examId}
+ </if>
+ <if test="apply.beginTime!=null and apply.beginTime!=''">
+ and sa.apply_time >= #{apply.beginTime}
+ </if>
+ <if test="apply.overTime!=null and apply.overTime!=''">
+ and sa.apply_time <= #{apply.overTime}
</if>
</select>
@@ -291,10 +386,8 @@
sa.user_id = bu.id
WHERE
1=1
- and is_exam = 1
and sa.apply_status = 2
- and bu.is_apply = 1
- and sa.exam_id is not null
+ and sa.exam_id = #{id}
</select>
<!-- 查询培训考试人数-->
@@ -309,10 +402,8 @@
sr.user_id = bu.id
WHERE
1=1
- and is_exam = 1
and sr.cancel = 1
- and bu.is_train = 1
- and sr.train_exam_id is not null
+ and sr.train_exam_id = #{id}
</select>
<!--查询已报名的的人信息集合-->
@@ -338,10 +429,8 @@
bd.id = bu.dept_id
WHERE
1=1
- and is_exam = 1
and sa.apply_status = 2
- and bu.is_apply = 1
- and sa.exam_id is not null
+ and sa.exam_id = #{id}
</select>
<!--查询已培训报名的的人信息集合-->
@@ -367,10 +456,8 @@
bd.id = bu.dept_id
WHERE
1=1
- and is_exam = 1
and sr.cancel = 1
- and bu.is_train = 1
- and sr.train_exam_id is not null
+ and sr.train_exam_id = #{id}
</select>
--
Gitblit v1.9.3