From 767f8e4c5b8bdb9b87c7529fe01220f7fa3671b1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 21:52:17 +0800
Subject: [PATCH] 1.取消报名接口修改, 2.批量报名接口修改

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index 91d67ae..2ef898b 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -5,9 +5,11 @@
     <!--考试成绩分页信息-->
     <select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
         SELECT
-         es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,
-         ke.exam_name examName,bu.real_name securityName,company,es.exam_time examTime,
-         all_grade allGrade,exam_end_time examEndTime,qualified,
+         es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
+         es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
+         ke.exam_name examName,
+         bu.real_name securityName,company,bu.account,
+         sa.is_exam isExam,
          bd.dept_name companyName
         FROM
             exam_score es
@@ -23,6 +25,10 @@
             ksxt_exam ke
         on
             ke.id = es.exam_id
+        left join
+            sys_apply sa
+        on
+            sa.user_id = bu.id
         WHERE
             1=1
         <if test="examScore.examName!=null and  examScore.examName!=''">
@@ -37,6 +43,9 @@
         <if test="examScore.userId!=null and  examScore.userId!=''">
             and es.user_id = #{examScore.userId}
         </if>
+        <if test="examScore.isExam!=null and  examScore.isExam!=''">
+            and sa.is_exam = #{examScore.isExam}
+        </if>
         <if test="examScore.examType!=null and  examScore.examType!=''">
             and ke.exam_type = #{examScore.examType}
         </if>

--
Gitblit v1.9.3