From 372ec8892f5ed3d11736e75abdd7f33ea34e0d2d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 03 Aug 2021 10:40:09 +0800
Subject: [PATCH] 个人考试信息查询接口修改

---
 src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml |    7 +++++--
 1 files changed, 5 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 2e76afc..dd08486 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -5,7 +5,7 @@
     <!--考试报名分页信息-->
     <select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
         SELECT
-            sa.id,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
+            sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
             ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
             bu.real_name name,sa.examination_type,sa.examination_mx,
             bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
@@ -28,6 +28,9 @@
         <if test="apply.name!=null and  apply.name!=''">
             and sa.name like concat('%', #{apply.name},'%')
         </if>
+        <if test="apply.deptName!=null and  apply.deptName!=''">
+            and bd.dept_name like concat('%', #{apply.deptName},'%')
+        </if>
         <if test="apply.userId!=null and  apply.userId!=''">
             and sa.user_id like concat('%', #{apply.userId},'%')
         </if>
@@ -45,7 +48,7 @@
     <!--考试报名详情信息-->
     <select id="selectApplyInfo" resultType="org.springblade.modules.apply.vo.ApplyVO">
         SELECT
-            sa.id,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
+            sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
             ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
             bu.real_name name,sa.examination_type,sa.examination_mx,
             bd.dept_name deptName

--
Gitblit v1.9.3