From 116143f2237156ff892d6951d6943285fa304f0e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Dec 2021 17:33:23 +0800
Subject: [PATCH] 考试成绩查询，导出修改，实操成绩导入去除准考证号，保安员导入新增身份证住址校验
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 27 ++++++++++++++++++++++-----
1 files changed, 22 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 7360c72..9645a24 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -120,14 +120,20 @@
<if test="examScore.examType!=null and examScore.examType!=''">
and ke.exam_type = #{examScore.examType}
</if>
+ <if test="examScore.isAvatar==1">
+ and bu.avatar is not null and bu.avatar!=""
+ </if>
+ <if test="examScore.isAvatar==2">
+ and (bu.avatar is null or bu.avatar="")
+ </if>
<if test="examScore.candidateNo!=null and examScore.candidateNo!=''">
and es.candidate_no = #{examScore.candidateNo}
</if>
<if test="examScore.qualified!=null">
and es.qualified = #{examScore.qualified}
</if>
- <if test="examScore.examDate!=null">
- and date_format(es.exam_time,'%Y-%m-%d') = #{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
</select>
@@ -250,9 +256,13 @@
blade_user bu
on
bu.id = es.user_id
+ left join
+ ksxt_exam ke
+ on
+ ke.id = es.exam_id
where
bu.cardid = #{idCardNo}
- and es.exam_id = #{examId}
+ and DATE_FORMAT(ke.start_time,'%Y-%m-%d') = #{startTime}
</select>
<!--修改成绩信息-->
@@ -348,7 +358,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>
@@ -373,6 +383,12 @@
<if test="examScore.isExam!=null and examScore.isExam!=''">
and str.is_exam = #{examScore.isExam}
</if>
+ <if test="examScore.isAvatar==1">
+ and bu.avatar is not null and bu.avatar!=""
+ </if>
+ <if test="examScore.isAvatar==2">
+ and (bu.avatar is null or bu.avatar="")
+ </if>
<if test="examScore.examType!=null and examScore.examType!=''">
and ke.exam_type = #{examScore.examType}
</if>
@@ -383,8 +399,9 @@
and es.qualified = #{examScore.qualified}
</if>
<if test="examScore.examDate!=null and examScore.examDate!=''">
- and date_format(es.exam_time,'%Y-%m-%d') = #{examScore.examDate}
+ and date_format(ke.start_time,'%Y-%m-%d') = #{examScore.examDate}
</if>
+ order by es.id desc
</select>
--
Gitblit v1.9.3