From 96d31712c6654b2b71ed04696a9bb30af4d7f79a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 23 Sep 2021 09:39:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 2348bd0..e30a281 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -6,7 +6,7 @@
<select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
SELECT
es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,
- exam_name examName,bu.real_name securityName,company,exam_time examTime,
+ ke.exam_name examName,bu.real_name securityName,company,es.exam_time examTime,
all_grade allGrade,exam_end_time examEndTime,qualified,
bd.dept_name companyName
FROM
@@ -19,6 +19,10 @@
blade_dept bd
on
bd.id = es.company
+ left join
+ ksxt_exam ke
+ on
+ ke.id = es.exam_id
WHERE
1=1
<if test="examScore.examName!=null and examScore.examName!=''">
@@ -39,6 +43,7 @@
<if test="examScore.qualified!=null">
and es.qualified = #{examScore.qualified}
</if>
+ order by es.id desc
</select>
<!--考试成绩详情信息-->
--
Gitblit v1.9.3