From c9f44e0ef916dd8d84639fe86d001a440ca76474 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 02 Aug 2021 20:13:38 +0800
Subject: [PATCH] 1.新增保安个人照片,准考证信息接口修改 2.新增导出清册接口

---
 src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml |   78 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 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 e6498da..2e76afc 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -28,6 +28,9 @@
         <if test="apply.name!=null and  apply.name!=''">
             and sa.name like concat('%', #{apply.name},'%')
         </if>
+        <if test="apply.userId!=null and  apply.userId!=''">
+            and sa.user_id like concat('%', #{apply.userId},'%')
+        </if>
         <if test="apply.applyStatus!=null">
             and apply_status = #{apply.applyStatus}
         </if>
@@ -81,12 +84,12 @@
         select count(*) from sys_apply where apply_code = #{applyCode}
     </select>
 
-    <!--获取准考证信息-->
+    <!--获取准考证信息(正式考试)-->
     <select id="getApplyInfo" resultType="org.springblade.modules.apply.vo.ApplyPaPerVO">
         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.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.my_picture myPicture,
             bd.dept_name deptName,"保安证" applyCard
         FROM
             sys_apply sa
@@ -105,4 +108,75 @@
         WHERE
             sa.id = #{apply.id}
     </select>
+
+
+    <!--获取准考证信息(模拟考试)-->
+    <select id="getTrainApplyInfo" resultType="org.springblade.modules.apply.vo.ApplyPaPerVO">
+        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,
+            ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName
+        FROM
+        sys_training_registration sr
+        LEFT JOIN
+        blade_dept bt
+        ON
+        sr.dept_id = bt.id
+        LEFT JOIN
+        blade_dept bt0
+        ON
+        sr.training_unit_id = bt0.id
+        left join
+        blade_user bu
+        on
+        sr.user_id = bu.id
+        left join
+        ksxt_exam ke
+        on
+        ke.id = sr.train_exam_id
+        WHERE
+        1=1
+          and sr.id = #{apply.id}
+    </select>
+
+    <!--导出报名清册数据-->
+    <select id="getApplyExcelList" resultType="org.springblade.modules.apply.excel.ApplyInfoExcel">
+        SELECT
+        sa.candidate_no candidateNo,sa.apply_time applyTime,
+        ke.start_time examTime,ke.exam_name examName,
+        bu.real_name realName,bu.cardid idCardNo,
+        bd.dept_name deptName,"保安证" applyCard
+        FROM
+        sys_apply sa
+        left join
+        ksxt_exam ke
+        on
+        sa.exam_id = ke.id
+        left join
+        blade_user bu
+        on
+        sa.user_id = bu.id
+        left join
+        blade_dept bd
+        on
+        bd.id = bu.dept_id
+        WHERE
+        1=1
+        <if test="apply.name!=null and  apply.name!=''">
+            and sa.name like concat('%', #{apply.name},'%')
+        </if>
+        <if test="apply.userId!=null and  apply.userId!=''">
+            and sa.user_id like concat('%', #{apply.userId},'%')
+        </if>
+        <if test="apply.applyStatus!=null">
+            and apply_status = #{apply.applyStatus}
+        </if>
+        <if test="apply.applyExamType!=null">
+            and apply_exam_type = #{apply.applyExamType}
+        </if>
+        <if test="apply.examId!=null">
+            and sa.exam_id = #{apply.examId}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3