From c9424db1c23fcddd6f4eabdb5e3ef51d2c208613 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 Aug 2021 16:09:49 +0800
Subject: [PATCH] 派遣记录,单位数据内网推送

---
 src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml |   11 ++++++++++-
 1 files changed, 10 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 98043cf..29910c6 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -6,8 +6,9 @@
     <select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
         SELECT
             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
@@ -36,6 +37,9 @@
         </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}
@@ -342,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