From 261e8684cc8495ad5a705c2f36c1ac82ad643ac3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 16:42:47 +0800
Subject: [PATCH] 报名接口修改

---
 src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml |   26 +++++++++++++++++++++++---
 1 files changed, 23 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 a9107e3..5e1dbcf 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -7,7 +7,7 @@
         SELECT
             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,
+            bu.real_name realName,bu.is_apply isApply,
             bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
         FROM
             sys_apply sa
@@ -26,8 +26,10 @@
         WHERE
             1=1
             and is_exam = 1
-        <if test="apply.name!=null and  apply.name!=''">
-            and sa.name like concat('%', #{apply.name},'%')
+            and sa.apply_status = 2
+            and bu.is_apply = 1
+        <if test="apply.realName!=null and  apply.realName!=''">
+            and bu.real_name like concat('%', #{apply.realName},'%')
         </if>
         <if test="apply.deptName!=null and  apply.deptName!=''">
             and bd.dept_name like concat('%', #{apply.deptName},'%')
@@ -207,4 +209,22 @@
         limit 1
     </select>
 
+    <!--查询报名人员未关联考试的ids集合-->
+    <select id="getApplyIds" resultType="java.lang.Long">
+        SELECT
+        sa.id
+        FROM
+        sys_apply sa
+        left join
+        blade_user bu
+        on
+        sa.user_id = bu.id
+        WHERE
+        1=1
+        and is_exam = 1
+        and sa.apply_status = 2
+        and bu.is_apply = 1
+        and sa.exam_id is null
+    </select>
+
 </mapper>

--
Gitblit v1.9.3