From 33a072160eda4fa7cb22d330c2bfa9048ad6c0e9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 22 Jul 2021 14:11:50 +0800
Subject: [PATCH] 派遣记录接口修改

---
 src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 6 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 3339314..2258020 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -5,29 +5,74 @@
     <!--考试报名分页信息-->
     <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,
+            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
         FROM
-            sys_apply
+            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 name like concat('%', #{apply.name},'%')
+            and sa.name like concat('%', #{apply.name},'%')
         </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>
 
     <!--考试报名详情信息-->
     <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,
+            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
         FROM
-            sys_apply
+            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.id!=null">
-            and id = #{apply.id}
+            and sa.id = #{apply.id}
+        </if>
+    </select>
+
+    <!--获取准考证前缀相同的数量-->
+    <select id="getCandidateNoCount" resultType="java.lang.Integer">
+        select count(*) from sys_apply
+        where 1=1
+        <if test="result!=null and result!=''">
+            and candidate_no like concat('%', #{result},'%')
         </if>
     </select>
 </mapper>

--
Gitblit v1.9.3