From d35732cfbf365e7ef423159a041408dfbe599d43 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 14:14:54 +0800
Subject: [PATCH] 成绩计算接口修改，通知公告上传接口修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 6a3fd3d..91d67ae 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,
- 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,10 +19,14 @@
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!=''">
- and es.exam_name like concat('%', #{examScore.examName},'%')
+ and ke.exam_name like concat('%', #{examScore.examName},'%')
</if>
<if test="examScore.companyName!=null and examScore.companyName!=''">
and bd.dept_name like concat('%', #{examScore.companyName},'%')
@@ -32,6 +36,9 @@
</if>
<if test="examScore.userId!=null and examScore.userId!=''">
and es.user_id = #{examScore.userId}
+ </if>
+ <if test="examScore.examType!=null and examScore.examType!=''">
+ and ke.exam_type = #{examScore.examType}
</if>
<if test="examScore.candidateNo!=null and examScore.candidateNo!=''">
and es.candidate_no = #{examScore.candidateNo}
@@ -75,7 +82,7 @@
exam_score) b
</select>
- <!---->
+ <!--根据用户身份证号查询考试成绩-->
<select id="getExamScoreInfoByIdCardNo" resultType="org.springblade.modules.exam.entity.ExamScore">
select
es.*
@@ -87,5 +94,6 @@
bu.id = es.user_id
where
bu.cardid = #{idCardNo}
+ and es.exam_id = #{examId}
</select>
</mapper>
--
Gitblit v1.9.3