From fe9c6432b0b6eea428bbb856fabe4f7d1e84f0cb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 27 Oct 2021 17:16:01 +0800
Subject: [PATCH] 保安员资格审查查询修改

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |   43 +++++++++++++++++++------------------------
 1 files changed, 19 insertions(+), 24 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 74caf54..d99d5a3 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -23,8 +23,19 @@
         ksxt_exam ke
         on
         ke.id = es.exam_id
+        left join
+        sys_information si
+        on
+        si.departmentid = bd.id
+        left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction
         WHERE
         1=1
+        <if test="examScore.jurisdiction!=null and examScore.jurisdiction!='' and examScore.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{coinspect.jurisdiction} or sj.parent_id = #{coinspect.jurisdiction})
+        </if>
         <if test="examScore.examName!=null and  examScore.examName!=''">
             and es.exam_name like concat('%', #{examScore.examName},'%')
         </if>
@@ -75,7 +86,8 @@
         bd.dept_name companyName,
         es.exam_time examTime,exam_end_time examEndTime,
         es.theory_grade theoryGrade,es.learn_grade learnGrade,
-        all_grade allGrade
+        all_grade allGrade,if(es.qualified=0,'合格','不合格或未导入实操成绩') qualified,
+        if(es.qualified=0,'是','否') isSecurity
         from
         exam_score es
         left join
@@ -91,10 +103,6 @@
         on
         bd.id = bu.dept_id
         left join
-        sys_training_registration str
-        on
-        str.id = es.apply_id
-        left join
         sys_information si
         on
         si.departmentid = bd.id
@@ -104,12 +112,11 @@
         sj.id = si.jurisdiction
         where
         1=1
-        and (str.is_exam = 2 or str.is_exam = 3)
         <if test="examScore.jurisdiction!=null and examScore.jurisdiction!='' and examScore.jurisdiction!='1372091709474910209'">
             and (sj.id = #{coinspect.jurisdiction} or sj.parent_id = #{coinspect.jurisdiction})
         </if>
         <if test="examScore.examName!=null and  examScore.examName!=''">
-            and ke.exam_name like concat('%', #{examScore.examName},'%')
+            and es.exam_name like concat('%', #{examScore.examName},'%')
         </if>
         <if test="examScore.companyName!=null and  examScore.companyName!=''">
             and bd.dept_name like concat('%', #{examScore.companyName},'%')
@@ -117,23 +124,8 @@
         <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.trainUnitId!=null">
-            and str.training_unit_id = #{examScore.trainUnitId}
-        </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}
@@ -141,8 +133,11 @@
         <if test="examScore.qualified!=null">
             and es.qualified = #{examScore.qualified}
         </if>
-        <if test="examScore.examDate!=null and examScore.examDate!=''">
-            and date_format(es.exam_time,'%Y-%m-%d') = #{examScore.examDate}
+        <if test="examScore.startTime!=null and examScore.startTime!=''">
+            and es.exam_time &gt;= #{examScore.startTime}
+        </if>
+        <if test="examScore.endTime!=null and examScore.endTime!=''">
+            and es.exam_time &lt;= #{examScore.endTime}
         </if>
         order by es.id desc
     </select>

--
Gitblit v1.9.3