From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 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 805df78..6f5b18d 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -5,28 +5,41 @@
<!--考试报名分页信息-->
<select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
SELECT
- sa.id,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
- ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
- bu.real_name realName,sa.examination_type,sa.examination_mx,
- bd.dept_name deptName
+ 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,
+ bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
FROM
- sys_apply sa
+ sys_apply sa
left join
- ksxt_exam ke
+ ksxt_exam ke
on
- sa.exam_id = ke.id
+ sa.exam_id = ke.id
left join
- blade_user bu
+ blade_user bu
on
- sa.user_id = bu.id
+ sa.user_id = bu.id
left join
- blade_dept bd
+ blade_dept bd
on
- bd.id = bu.dept_id
+ bd.id = bu.dept_id
WHERE
- 1=1
- <if test="apply.name!=null and apply.name!=''">
- and sa.name like concat('%', #{apply.name},'%')
+ 1=1
+ and is_exam = 1
+ and sa.apply_status = 2
+ and bu.is_apply = 1
+ <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.applyStatus!=null">
and apply_status = #{apply.applyStatus}
--
Gitblit v1.9.3