From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录,车辆,装备,枪支,招聘,培训考试修改

---
 src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
index 1298d32..ab191c8 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -110,7 +110,10 @@
             and exam_type = #{paper.examType}
         </if>
         <if test="paper.examName!=null and paper.examName!=''">
-            and exam_name = #{paper.examName}
+            and exam_name like concat('%',#{paper.examName},'%')
+        </if>
+        <if test="paper.auditStatus!=null and paper.auditStatus!=''">
+            and audit_status = #{paper.auditStatus}
         </if>
         order by start_time desc
     </select>
@@ -222,6 +225,7 @@
         and bu.is_train = 1
         and str.is_exam = 1
         and str.cancel = 1
+        and str.train_exam_id = #{id}
     </select>
 
     <!--使用考试名称匹配考试信息-->
@@ -249,4 +253,37 @@
         and cancel = 1
     </select>
 
+    <!--根据用户id查询报名信息-->
+    <select id="getApplyDetail" resultType="org.springblade.modules.apply.entity.Apply">
+        (select
+            sa.id as id
+        from
+            sys_apply sa
+        left join
+            blade_user bu
+        on
+            bu.id = sa.user_id
+        where sa.user_id = #{userId}
+        and is_apply = 1
+        and is_exam = 1
+        and sa.apply_status = 2
+        )
+
+        union all
+
+        (select
+            str.id as id
+        from
+            sys_training_registration str
+        left join
+            blade_user bu
+        on
+            bu.id = str.user_id
+        where str.user_id = #{userId}
+        and bu.is_train = 1
+        and is_exam = 1
+        and str.cancel = 1
+        )
+    </select>
+
 </mapper>

--
Gitblit v1.9.3