From d35732cfbf365e7ef423159a041408dfbe599d43 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 14:14:54 +0800
Subject: [PATCH] 成绩计算接口修改,通知公告上传接口修改

---
 src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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 8bacda6..67650ba 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -136,7 +136,7 @@
         (select
             ke.id,ke.exam_name examName,
             sa.candidate_no candidateNo,
-            bu.real_name realName,bu.sex
+            bu.real_name realName,bu.sex,bu.cardid idCardNo
         from
             ksxt_exam ke
         left join
@@ -148,6 +148,7 @@
         on
             bu.id = sa.user_id
         where sa.user_id = #{userId}
+        and is_apply = 1
         and is_exam = 1
         and sa.apply_status = 2
         )
@@ -157,7 +158,7 @@
         (select
             ke.id,ke.exam_name examName,
             str.candidate_no candidateNo,
-            bu.real_name realName,bu.sex
+            bu.real_name realName,bu.sex,bu.cardid idCardNo
         from
             ksxt_exam ke
         left join
@@ -169,8 +170,10 @@
         on
             bu.id = str.user_id
         where str.user_id = #{userId}
+        and bu.is_train = 1
         and is_exam = 1
-        and str.cancel = 3
+        and ke.audit_status = 1
+        and str.cancel = 1
         )
     </select>
 
@@ -203,4 +206,13 @@
         and str.cancel = 1
     </select>
 
+    <!--使用考试名称匹配考试信息-->
+    <select id="getExamInfoByExamName" resultType="org.springblade.modules.exam.entity.ExamPaper">
+        SELECT
+            *
+        FROM
+            ksxt_exam
+        where exam_name like concat('%', #{examName},'%')
+    </select>
+
 </mapper>

--
Gitblit v1.9.3