From c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 21:42:52 +0800
Subject: [PATCH] 报名接口修改,考试计算成绩接口修改，对比答案修改为对比所有题目

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |   70 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 11 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 b957086..cfcc659 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,46 @@
     <!--考试成绩分页信息-->
     <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,
-         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.examType!=null">
-            and exam_type = #{examScore.examType}
+        <if test="examScore.userId!=null and  examScore.userId!=''">
+            and es.user_id = #{examScore.userId}
+        </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>
     </select>
 
     <!--考试成绩详情信息-->
     <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
@@ -40,4 +55,37 @@
             and id = #{examScore.id}
         </if>
     </select>
+
+
+    <!--考试成绩详情信息-->
+    <select id="scoreStatistics" resultType="java.util.HashMap">
+        SELECT * FROM(SELECT
+        COUNT( CASE WHEN theory_grade &lt; 60 THEN 1 END ) AS 'bhg',
+        COUNT( CASE WHEN theory_grade >= 60 AND theory_grade &lt; 80 THEN 1 END ) AS 'hg',
+        COUNT( CASE WHEN theory_grade >= 80 AND theory_grade &lt; 90 THEN 1 END ) AS 'lh',
+        COUNT( CASE WHEN theory_grade >= 90 THEN 1 END ) AS 'yx'
+        FROM
+        exam_score) a UNION ALL
+        SELECT * FROM( SELECT
+        COUNT( CASE WHEN learn_grade &lt; 60 THEN 1 END ) AS 'bhg',
+        COUNT( CASE WHEN learn_grade >= 60 AND learn_grade &lt; 80 THEN 1 END ) AS 'hg',
+        COUNT( CASE WHEN learn_grade >= 80 AND learn_grade &lt; 90 THEN 1 END ) AS 'lh',
+        COUNT( CASE WHEN learn_grade >= 90 THEN 1 END ) AS 'yx'
+        FROM
+        exam_score) b
+    </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