From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |   48 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 38 insertions(+), 10 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 f0c786d..f0acf06 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -30,7 +30,7 @@
         sa.id = es.apply_id
         where
         1=1
-        and (sa.is_exam = 2 or sa.is_exam = 3)
+        and ke.exam_type = 1
         <if test="examScore.examName!=null and  examScore.examName!=''">
             and ke.exam_name like concat('%', #{examScore.examName},'%')
         </if>
@@ -155,7 +155,7 @@
 <!--        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'">-->
+<!--        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1372091709474910209'">-->
 <!--             AND user.jurisdiction = #{jurisdiction}-->
 <!--        </if>-->
 <!--        <if test="deptid!=null and deptid==''">-->
@@ -171,7 +171,7 @@
 <!--        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'">-->
+<!--        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1372091709474910209'">-->
 <!--            AND user.jurisdiction = #{jurisdiction}-->
 <!--        </if>-->
 <!--        <if test="deptid!=null and deptid==''">-->
@@ -189,7 +189,7 @@
         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'">
+        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
             AND user.jurisdiction = #{jurisdiction}
         </if>
         <if test="deptid!=null and deptid!=''">
@@ -207,7 +207,7 @@
         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'">
+        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
             AND user.jurisdiction = #{jurisdiction}
         </if>
         <if test="deptid!=null and deptid!=''">
@@ -221,17 +221,35 @@
         SELECT
             exam.*,
             user.jurisdiction,
-            user.dept_id
+            user.dept_id,
+            user.real_name realName,
+            ke.exam_name examName
         FROM
             exam_score exam
-        LEFT JOIN blade_user user ON exam.user_id = user.id
+        LEFT JOIN blade_user user
+        ON exam.user_id = user.id
+        left join
+        ksxt_exam ke
+        on
+        ke.id = exam.exam_id
+        left join
+        sys_information si
+        on
+        user.dept_id = si.departmentid
+        left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction
         WHERE
         1 = 1
-        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
-            AND user.jurisdiction = #{jurisdiction}
+        <if test="realName!=null and realName!=''">
+            AND user.real_name = #{realName}
+        </if>
+        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+            AND (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
         </if>
         <if test="deptid!=null and deptid!=''">
-                AND user.dept_id = #{deptid}
+            AND user.dept_id = #{deptid}
         </if>
     </select>
 
@@ -254,4 +272,14 @@
     <update id="updateByIdAndQualifiee">
         update exam_score set qualified = #{examScore.qualified} where id = #{examScore.id}
     </update>
+
+
+    <!--考试合格人数对比-->
+    <select id="scoreStat" resultType="java.lang.Object">
+        select count(*) from exam_score where 1=1
+        union all
+        (select count(*) from exam_score where qualified =0)
+        union all
+        (select count(*) from exam_score where qualified !=0)
+    </select>
 </mapper>

--
Gitblit v1.9.3