From 084df211271b476c5d285e704e4b32f0ffb5fbe7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 23:52:58 +0800
Subject: [PATCH] 辖区接口修改，成绩计算修改，导入密码取身份证后6位

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 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 76f5e51..23ab21b 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -40,6 +40,9 @@
         <if test="examScore.securityName!=null and  examScore.securityName!=''">
             and bu.real_name like concat('%', #{examScore.securityName},'%')
         </if>
+        <if test="examScore.account!=null and  examScore.account!=''">
+            and bu.account like concat('%', #{examScore.account},'%')
+        </if>
         <if test="examScore.userId!=null and  examScore.userId!=''">
             and es.user_id = #{examScore.userId}
         </if>
@@ -99,6 +102,9 @@
         <if test="examScore.securityName!=null and  examScore.securityName!=''">
             and bu.real_name like concat('%', #{examScore.securityName},'%')
         </if>
+        <if test="examScore.account!=null and  examScore.account!=''">
+            and bu.account like concat('%', #{examScore.account},'%')
+        </if>
         <if test="examScore.userId!=null and  examScore.userId!=''">
             and es.user_id = #{examScore.userId}
         </if>
@@ -143,14 +149,32 @@
         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
+        exam_score exam
+	    LEFT JOIN blade_user user ON exam.user_id = user.id
+        WHERE 1 = 1
+        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
+             AND user.jurisdiction = #{jurisdiction}
+        </if>
+        <if test="deptid!=null and deptid==''">
+            AND user.dept_id = #{deptid}
+        </if>
+        ) 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
+        exam_score exam
+        LEFT JOIN blade_user user ON exam.user_id = user.id
+        WHERE 1 = 1
+        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
+            AND user.jurisdiction = #{jurisdiction}
+        </if>
+        <if test="deptid!=null and deptid==''">
+            AND user.dept_id = #{deptid}
+        </if>
+        ) b
     </select>
 
     <!--根据用户身份证号查询考试成绩-->

--
Gitblit v1.9.3