From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改,保安证编码生成修改

---
 src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 4063ed3..8a94db8 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,
+            bu.real_name realName,bu.is_apply isApply, TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()) age,
             bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
         FROM
             sys_apply sa
@@ -99,7 +99,7 @@
         SELECT
             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.my_picture myPicture,
+            bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.avatar myPicture,
             bd.dept_name deptName,"保安证" applyCard
         FROM
             sys_apply sa
@@ -125,7 +125,7 @@
         select
             sr.candidate_no candidateNo,
             bt.dept_name AS deptName,"保安证" applyCard,
-            bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.my_picture myPicture,
+            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
         FROM
         sys_training_registration sr
@@ -346,4 +346,9 @@
         </if>
     </select>
 
+    <!--查询报名信息,取最新的一条(即当前userId,)applyId最大的一条记录-->
+    <select id="getMaxApplyIdByUserIdInfo" resultType="org.springblade.modules.apply.entity.Apply">
+        select MAX(id) id from sys_apply where user_id = #{userId}
+    </select>
+
 </mapper>

--
Gitblit v1.9.3