From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |   85 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 73 insertions(+), 12 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..41074fd 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>
@@ -136,21 +142,76 @@
 
 
     <!--考试成绩详情信息-->
+<!--    <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 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 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>-->
+
+    <!--考试成绩详情信息 理论-->
     <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'
+        SELECT
+        theory_grade as fs,
+        COUNT( * ) AS count
         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'
+        exam_score exam
+        LEFT JOIN blade_user user ON exam.user_id = user.id
+        WHERE 1 = 1 AND theory_grade is not null
+        <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>
+        GROUP BY
+        exam.theory_grade
+    </select>
+    <!--考试成绩详情信息 实操-->
+    <select id="scoreStatisticssc" resultType="java.util.HashMap">
+        SELECT
+        learn_grade as fs,
+        COUNT( * ) AS count
         FROM
-        exam_score) b
+        exam_score exam
+        LEFT JOIN blade_user user ON exam.user_id = user.id
+        WHERE 1 = 1 AND learn_grade is not null
+        <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>
+        GROUP BY
+        exam.learn_grade
     </select>
 
     <!--根据用户身份证号查询考试成绩-->

--
Gitblit v1.9.3