From 58e7098bd2ef7db52c6305419654bffb2d54b8a8 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 21 Aug 2021 17:44:20 +0800
Subject: [PATCH] 1.ftp

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |   53 +++++++++++++++++++++++++----------------------------
 1 files changed, 25 insertions(+), 28 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 5eae6aa..ca3bd34 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -5,34 +5,32 @@
     <!--考试成绩分页信息-正式考试-->
     <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,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
-        sys_apply sa
+        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,
+        sa.is_exam isExam,
+        bu.real_name securityName,company,bu.account,
+        bd.dept_name companyName from
+        exam_score es
+        left join
+        ksxt_exam ke
+        on
+        ke.id = es.exam_id
         left join
         blade_user bu
         on
-        sa.user_id = bu.id
+        es.user_id = bu.id
         left join
         blade_dept bd
         on
         bd.id = bu.dept_id
         left join
-        ksxt_exam ke
+        sys_apply sa
         on
-        ke.id = sa.exam_id
-        left join
-        exam_score es
-        on
-        es.exam_id = sa.exam_id
+        sa.id = es.apply_id
         where
         1=1
         and (sa.is_exam = 2 or sa.is_exam = 3)
-        and ke.exam_type = 1
         <if test="examScore.examName!=null and  examScore.examName!=''">
             and ke.exam_name like concat('%', #{examScore.examName},'%')
         </if>
@@ -66,28 +64,27 @@
             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,
             str.is_exam isExam,
-            bd.dept_name companyName
-        FROM
-        sys_training_registration str
+            bu.real_name securityName,company,bu.account,
+            bd.dept_name companyName from
+            exam_score es
+        left join
+        ksxt_exam ke
+        on
+        ke.id = es.exam_id
         left join
         blade_user bu
         on
-        str.user_id = bu.id
+        es.user_id = bu.id
         left join
         blade_dept bd
         on
         bd.id = bu.dept_id
         left join
-        ksxt_exam ke
+        sys_training_registration str
         on
-        ke.id = str.train_exam_id
-        left join
-        exam_score es
-        on
-        es.exam_id = str.train_exam_id
-        WHERE
+        str.id = es.apply_id
+        where
         1=1
         and (str.is_exam = 2 or str.is_exam = 3)
         <if test="examScore.examName!=null and  examScore.examName!=''">

--
Gitblit v1.9.3