From 61e8c756cc2a9e503d643672f103c3837fadc1d4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 21:27:28 +0800
Subject: [PATCH] 保安员，保安公司查询修改
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 8a94db8..874d340 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -8,7 +8,7 @@
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, TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()) age,
+ 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
@@ -42,7 +42,7 @@
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}
--
Gitblit v1.9.3