From 6beeb715fcef8db22b17c309ec8fecc45cc04b00 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 16:30:47 +0800
Subject: [PATCH] 1.考试成绩查询修改 2.用户查询修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 69 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 33 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 63e8275..5eae6aa 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -5,32 +5,34 @@
<!--考试成绩分页信息-正式考试-->
<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
+ 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
+ sys_apply sa
left join
- blade_user bu
+ blade_user bu
on
- es.user_id = bu.id
+ sa.user_id = bu.id
left join
- blade_dept bd
+ blade_dept bd
on
- bd.id = es.company
+ bd.id = bu.dept_id
left join
- ksxt_exam ke
+ ksxt_exam ke
on
- ke.id = es.exam_id
+ ke.id = sa.exam_id
left join
- sys_apply sa
+ exam_score es
on
- sa.user_id = bu.id
- WHERE
- 1=1
+ es.exam_id = sa.exam_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>
@@ -61,32 +63,33 @@
<!--考试成绩分页信息-模拟考试-->
<select id="selectTrainExamScorePage" 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,
- str.is_exam isExam,
- bd.dept_name companyName
+ 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
- exam_score es
+ sys_training_registration str
left join
- blade_user bu
+ blade_user bu
on
- es.user_id = bu.id
+ str.user_id = bu.id
left join
- blade_dept bd
+ blade_dept bd
on
- bd.id = es.company
+ bd.id = bu.dept_id
left join
- ksxt_exam ke
+ ksxt_exam ke
on
- ke.id = es.exam_id
+ ke.id = str.train_exam_id
left join
- sys_training_registration str
+ exam_score es
on
- str.user_id = bu.id
+ es.exam_id = str.train_exam_id
WHERE
- 1=1
+ 1=1
+ and (str.is_exam = 2 or str.is_exam = 3)
<if test="examScore.examName!=null and examScore.examName!=''">
and ke.exam_name like concat('%', #{examScore.examName},'%')
</if>
--
Gitblit v1.9.3