From 859fc9f3c05e88c1d1af5dcdb91c88800c2aab5d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 02 Dec 2021 14:29:09 +0800
Subject: [PATCH] 调度指令新增修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 00ae3b2..7360c72 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,es.user_id userId,es.exam_id examId,
- es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
+ es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,es.candidate_no candidateNo,
ke.exam_name examName,
sa.is_exam isExam,
bu.real_name securityName,company,bu.account,
@@ -68,10 +68,10 @@
<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,
+ es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,es.candidate_no candidateNo,
ke.exam_name examName,
str.is_exam isExam,
- bu.real_name securityName,company,bu.account,
+ bu.real_name securityName,company,bu.account,bu.sex,bu.paper_time paperTime,bu.securitynumber securityNumber,bu.avatar,
bd.dept_name companyName from
exam_score es
left join
@@ -92,7 +92,7 @@
str.id = es.apply_id
where
1=1
- and (str.is_exam = 2 or str.is_exam = 3)
+ and (str.is_exam = 2 or str.is_exam = 3 or str.is_exam = 4)
<if test="examScore.examName!=null and examScore.examName!=''">
and ke.exam_name like concat('%', #{examScore.examName},'%')
</if>
@@ -129,6 +129,7 @@
<if test="examScore.examDate!=null">
and date_format(es.exam_time,'%Y-%m-%d') = #{examScore.examDate}
</if>
+ order by es.id desc
</select>
<!--考试成绩详情信息-->
@@ -324,7 +325,7 @@
SELECT
ke.exam_name examName,bu.real_name securityName,bu.cardid idCardNo,
bd.dept_name companyName,
- es.exam_time examTime,exam_end_time examEndTime,
+ es.exam_time examTime,exam_end_time examEndTime,es.candidate_no candidateNo,
es.theory_grade theoryGrade,es.learn_grade learnGrade,
all_grade allGrade
from
--
Gitblit v1.9.3