From d9caa6f336a052a852b4b9f9fedb57bdbed77386 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 17 Sep 2021 09:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 03fb3bf..3ec9453 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -202,7 +202,8 @@
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.avatar myPicture,
- bd.dept_name deptName,"保安证" applyCard
+ bd.dept_name deptName,"保安证" applyCard,
+ er.exam_room_name examRoomName,er.address,er.exam_room_no examRoomNo
FROM
sys_apply sa
left join
@@ -217,6 +218,10 @@
blade_dept bd
on
bd.id = bu.dept_id
+ left join
+ exam_room er
+ on
+ er.id = ke.exam_room_id
WHERE
sa.id = #{apply.id}
</select>
--
Gitblit v1.9.3