From 92b71ac07ad4e0b7282135cad0919a4be4ec1efb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 29 Jul 2021 11:33:08 +0800
Subject: [PATCH] 考试成绩导入接口修改，查询接口修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 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 d4cec07..1beef9d 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -5,31 +5,40 @@
<!--考试成绩分页信息-->
<select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
SELECT
- 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
+ es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,
+ exam_name examName,bu.real_name securityName,company,exam_time examTime,
+ all_score allScore,exam_end_time examEndTime,qualified,
+ bd.dept_name companyName
FROM
- exam_score
+ exam_score es
+ left join
+ blade_user bu
+ on
+ es.user_id = bu.id
+ left join
+ blade_dept bd
+ on
+ bd.id = es.company
WHERE
1=1
<if test="examScore.examName!=null and examScore.examName!=''">
- and exam_name like concat('%', #{examScore.examName},'%')
+ and es.exam_name like concat('%', #{examScore.examName},'%')
</if>
- <if test="examScore.company!=null and examScore.company!=''">
- and company like concat('%', #{examScore.company},'%')
+ <if test="examScore.companyName!=null and examScore.companyName!=''">
+ and bd.dept_name like concat('%', #{examScore.companyName},'%')
</if>
<if test="examScore.securityName!=null and examScore.securityName!=''">
- and security_name like concat('%', #{examScore.securityName},'%')
+ and bu.real_name like concat('%', #{examScore.securityName},'%')
</if>
<if test="examScore.userId!=null and examScore.userId!=''">
- and user_id = #{examScore.userId}
+ and es.user_id = #{examScore.userId}
</if>
<if test="examScore.candidateNo!=null and examScore.candidateNo!=''">
- and candidate_no = #{examScore.candidateNo}
+ and es.candidate_no = #{examScore.candidateNo}
</if>
-<!-- <if test="examScore.examType!=null">-->
-<!-- and exam_type = #{examScore.examType}-->
-<!-- </if>-->
+ <if test="examScore.qualified!=null">
+ and es.qualified = #{examScore.qualified}
+ </if>
</select>
<!--考试成绩详情信息-->
@@ -46,4 +55,18 @@
and id = #{examScore.id}
</if>
</select>
+
+ <!---->
+ <select id="getExamScoreInfoByIdCardNo" resultType="org.springblade.modules.exam.entity.ExamScore">
+ select
+ es.*
+ from
+ exam_score es
+ left join
+ blade_user bu
+ on
+ bu.id = es.user_id
+ where
+ bu.cardid = #{idCardNo}
+ </select>
</mapper>
--
Gitblit v1.9.3