From e2ea82b9219c1fa616a6d877480f23e7a5aa3f29 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 17 Jan 2022 19:05:21 +0800
Subject: [PATCH] 1.考试修改 2.押运人员定位修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 40af7e9..a2cd388 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -69,7 +69,7 @@
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.candidate_no candidateNo,
- ke.exam_name examName,
+ ke.exam_name examName,date_format(ke.start_time,'%Y-%m-%d') startTime,date_format(ke.end_time,'%Y-%m-%d') endTime,
str.is_exam isExam,
bu.real_name securityName,company,bu.account,bu.sex,bu.paper_time paperTime,bu.securitynumber securityNumber,bu.avatar,
bd.dept_name companyName,bu.user_type isPaper
@@ -121,8 +121,8 @@
<if test="examScore.examType!=null and examScore.examType!=''">
and ke.exam_type = #{examScore.examType}
</if>
- <if test="examScore.examType!=null and examScore.examType!=''">
- and ke.exam_type = #{examScore.examType}
+ <if test="examScore.examId!=null">
+ and es.exam_id = #{examScore.examId}
</if>
<if test="examScore.isPaper==6">
and bu.user_type = #{examScore.isPaper}
@@ -145,8 +145,11 @@
<if test="examScore.examDate!=null and examScore.examDate!=''">
and date_format(ke.start_time,'%Y-%m-%d') = #{examScore.examDate}
</if>
- <if test="examScore.sortName!=null and examScore.sortName!=''">
+ <if test="examScore.sortName!=null and examScore.sortName!='' and examScore.sortName!='companyName'">
ORDER BY es.${examScore.sortName} ${examScore.sort},es.id desc
+ </if>
+ <if test="examScore.sortName=='companyName'">
+ ORDER BY bd.dept_name ${examScore.sort},es.id desc
</if>
<if test="examScore.sortName==null or examScore.sortName==''">
order by es.id desc
@@ -379,7 +382,7 @@
where
1=1
and (str.is_exam = 2 or str.is_exam = 3 or str.is_exam = 4)
- <if test="examScore.examName!=null and examScore.examName!=''">
+ <if test="examScore.examName!=null and examScore.examName!='' and examScore.examName!='undefined'">
and ke.exam_name like concat('%', #{examScore.examName},'%')
</if>
<if test="examScore.companyName!=null and examScore.companyName!=''">
@@ -403,6 +406,9 @@
<if test="examScore.userId!=null and examScore.userId!=''">
and es.user_id = #{examScore.userId}
</if>
+ <if test="examScore.examId!=null and examScore.examId!='undefined'">
+ and es.exam_id = #{examScore.examId}
+ </if>
<if test="examScore.deptId!=null and examScore.deptId!=''">
and bd.id = #{examScore.deptId}
</if>
@@ -424,10 +430,18 @@
<if test="examScore.qualified!=null">
and es.qualified = #{examScore.qualified}
</if>
- <if test="examScore.examDate!=null and examScore.examDate!=''">
+ <if test="examScore.examDate!=null and examScore.examDate!=''">
and date_format(ke.start_time,'%Y-%m-%d') = #{examScore.examDate}
</if>
- order by es.id desc
+ <if test="examScore.sortName!=null and examScore.sortName!='' and examScore.sortName!='companyName'">
+ ORDER BY es.${examScore.sortName} ${examScore.sort},es.id desc
+ </if>
+ <if test="examScore.sortName=='companyName'">
+ ORDER BY bd.dept_name ${examScore.sort},es.id desc
+ </if>
+ <if test="examScore.sortName==null or examScore.sortName==''">
+ order by es.id desc
+ </if>
</select>
<!--导出-按条件查询成绩数据-模拟考试-->
--
Gitblit v1.9.3