From 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 11:05:44 +0800
Subject: [PATCH] 1.许可审批

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |  100 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 81 insertions(+), 19 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 2ef898b..76f5e51 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -2,35 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.modules.exam.mapper.ExamScoreMapper">
 
-    <!--考试成绩分页信息-->
+    <!--考试成绩分页信息-正式考试-->
     <select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
         SELECT
-         es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
-         es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
-         ke.exam_name examName,
-         bu.real_name securityName,company,bu.account,
-         sa.is_exam isExam,
-         bd.dept_name companyName
-        FROM
-            exam_score es
+        es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
+        es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
+        ke.exam_name examName,
+        sa.is_exam isExam,
+        bu.real_name securityName,company,bu.account,
+        bd.dept_name companyName from
+        exam_score es
         left join
-            blade_user bu
+        ksxt_exam ke
         on
-            es.user_id = bu.id
+        ke.id = es.exam_id
         left join
-            blade_dept bd
+        blade_user bu
         on
-            bd.id = es.company
+        es.user_id = bu.id
         left join
-            ksxt_exam ke
+        blade_dept bd
         on
-            ke.id = es.exam_id
+        bd.id = bu.dept_id
         left join
-            sys_apply sa
+        sys_apply sa
         on
-            sa.user_id = bu.id
-        WHERE
-            1=1
+        sa.id = es.apply_id
+        where
+        1=1
+        and (sa.is_exam = 2 or sa.is_exam = 3)
         <if test="examScore.examName!=null and  examScore.examName!=''">
             and ke.exam_name like concat('%', #{examScore.examName},'%')
         </if>
@@ -43,6 +43,9 @@
         <if test="examScore.userId!=null and  examScore.userId!=''">
             and es.user_id = #{examScore.userId}
         </if>
+        <if test="examScore.deptId!=null and  examScore.deptId!=''">
+            and bd.id = #{examScore.deptId}
+        </if>
         <if test="examScore.isExam!=null and  examScore.isExam!=''">
             and sa.is_exam = #{examScore.isExam}
         </if>
@@ -57,6 +60,65 @@
         </if>
     </select>
 
+
+    <!--考试成绩分页信息-模拟考试-->
+    <select id="selectTrainExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
+        SELECT
+            es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
+            es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
+            ke.exam_name examName,
+            str.is_exam isExam,
+            bu.real_name securityName,company,bu.account,
+            bd.dept_name companyName from
+            exam_score es
+        left join
+        ksxt_exam ke
+        on
+        ke.id = es.exam_id
+        left join
+        blade_user bu
+        on
+        es.user_id = bu.id
+        left join
+        blade_dept bd
+        on
+        bd.id = bu.dept_id
+        left join
+        sys_training_registration str
+        on
+        str.id = es.apply_id
+        where
+        1=1
+        and (str.is_exam = 2 or str.is_exam = 3)
+        <if test="examScore.examName!=null and  examScore.examName!=''">
+            and ke.exam_name like concat('%', #{examScore.examName},'%')
+        </if>
+        <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 bu.real_name like concat('%', #{examScore.securityName},'%')
+        </if>
+        <if test="examScore.userId!=null and  examScore.userId!=''">
+            and es.user_id = #{examScore.userId}
+        </if>
+        <if test="examScore.deptId!=null and  examScore.deptId!=''">
+            and bd.id = #{examScore.deptId}
+        </if>
+        <if test="examScore.isExam!=null and  examScore.isExam!=''">
+            and str.is_exam = #{examScore.isExam}
+        </if>
+        <if test="examScore.examType!=null and  examScore.examType!=''">
+            and ke.exam_type = #{examScore.examType}
+        </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

--
Gitblit v1.9.3