From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |   90 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 88 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 60eb69d..eecf6ea 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -6,8 +6,8 @@
     <select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
         SELECT
         es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,
-        exam_name examName,bu.real_name securityName,company,exam_time examTime,
-        all_score allScore,exam_end_time examEndTime,qualified,
+        ke.exam_name examName,bu.real_name securityName,company,es.exam_time examTime,
+        all_grade allGrade,exam_end_time examEndTime,qualified,
         bd.dept_name companyName
         FROM
         exam_score es
@@ -19,8 +19,23 @@
         blade_dept bd
         on
         bd.id = es.company
+        left join
+        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>
@@ -39,6 +54,13 @@
         <if test="examScore.qualified!=null">
             and es.qualified = #{examScore.qualified}
         </if>
+        <if test="examScore.startTime!=null and examScore.startTime!=''">
+            and bu.paper_time &gt;= #{examScore.startTime}
+        </if>
+        <if test="examScore.endTime!=null and examScore.endTime!=''">
+            and bu.paper_time &lt;= #{examScore.endTime}
+        </if>
+        order by es.id desc
     </select>
 
     <!--考试成绩详情信息-->
@@ -55,4 +77,68 @@
             and id = #{examScore.id}
         </if>
     </select>
+
+
+    <!--考试成绩分页信息-->
+    <select id="exportExamScoreList" resultType="org.springblade.modules.exam.excel.ExportExamScoreExcel">
+        SELECT
+        ke.exam_name examName,bu.real_name securityName,bu.cardid idCardNo,
+        bd.dept_name companyName,
+        es.exam_time examTime,exam_end_time examEndTime,
+        es.theory_grade theoryGrade,es.learn_grade learnGrade,
+        all_grade allGrade,if(es.qualified=0,'合格','不合格或未导入实操成绩') qualified,
+        if(es.qualified=0,'是','否') isSecurity
+        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_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>
+        <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.candidateNo!=null and  examScore.candidateNo!=''">
+            and es.candidate_no = #{examScore.candidateNo}
+        </if>
+        <if test="examScore.qualified!=null">
+            and es.qualified = #{examScore.qualified}
+        </if>
+        <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>
 </mapper>

--
Gitblit v1.9.3