From 2b7013958fc02dd1d41b780d08768636df4e5c1f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Sep 2021 14:11:25 +0800
Subject: [PATCH] 考试报名列表接口修改，考试生成修改
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 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 874d340..e94e6ba 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -41,8 +41,15 @@
<if test="apply.examinationType!=null and apply.examinationType!=''">
and sa.examination_type = #{apply.examinationType}
</if>
- <if test="apply.applyStatus!=null">
- and sa.exam_id is null
+ <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>
+ <if test="apply.applyStatus==4">
+ and sa.apply_status = 4
+ and bu.is_apply = 2
</if>
<if test="apply.applyExamType!=null">
and apply_exam_type = #{apply.applyExamType}
@@ -126,7 +133,8 @@
sr.candidate_no candidateNo,
bt.dept_name AS deptName,"保安证" applyCard,
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
+ 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
@@ -145,6 +153,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}
@@ -214,21 +226,57 @@
</select>
<!--查询报名人员未关联考试的ids集合-->
- <select id="getApplyIds" resultType="java.lang.Long">
+ <select id="getApplyIds" resultType="org.springblade.modules.apply.entity.Apply">
SELECT
- sa.id
+ sa.id,sa.exam_id
FROM
sys_apply sa
+ left join
+ ksxt_exam ke
+ on
+ sa.exam_id = ke.id
left join
blade_user bu
on
sa.user_id = bu.id
+ left join
+ blade_dept bd
+ on
+ 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 null
+ <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.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>
+ <if test="apply.applyStatus==4">
+ and sa.apply_status = 4
+ and bu.is_apply = 2
+ </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>
+ limit #{apply.serialStart},#{apply.serialEnd}
</select>
<!--查询考试人数-->
--
Gitblit v1.9.3