From b26fa47a83c05779eb686283f6bde81717ee00e4 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 29 Jul 2021 08:46:45 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 dce17ed..d4cec07 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -5,7 +5,7 @@
<!--考试成绩分页信息-->
<select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
SELECT
- id,candidate_no candidateNo,theory_grade theoryGrade,isnull(learn_grade,-1) learnGrade,all_grade,
+ id,candidate_no candidateNo,theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,all_grade,
exam_name examName,security_name securityName,exam_type examType,company,exam_time examTime,
all_score allScore,exam_end_time examEndTime,qualified
FROM
@@ -21,6 +21,12 @@
<if test="examScore.securityName!=null and examScore.securityName!=''">
and security_name like concat('%', #{examScore.securityName},'%')
</if>
+ <if test="examScore.userId!=null and examScore.userId!=''">
+ and user_id = #{examScore.userId}
+ </if>
+ <if test="examScore.candidateNo!=null and examScore.candidateNo!=''">
+ and candidate_no = #{examScore.candidateNo}
+ </if>
<!-- <if test="examScore.examType!=null">-->
<!-- and exam_type = #{examScore.examType}-->
<!-- </if>-->
@@ -29,7 +35,7 @@
<!--考试成绩详情信息-->
<select id="selectExamScoreInfo" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
SELECT
- id,candidate_no candidateNo,theory_grade theoryGrade,isnull(learn_grade,-1) learnGrade,all_grade,
+ id,candidate_no candidateNo,theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,all_grade,
exam_name examName,security_name securityName,exam_type examType,company,exam_time examTime,
all_score allScore,exam_end_time examEndTime,qualified
FROM
--
Gitblit v1.9.3