From 9a4a283a1413188ff5763b5e2e72c26bc2f5db3d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 08 Oct 2021 14:19:55 +0800
Subject: [PATCH] 准考证生成修改

---
 src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
index 84f8b7d..f0ea549 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -101,9 +101,19 @@
 
     <select id="selectExamPaperPage" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
         SELECT
-            *
+            ke.*,
+            bu.real_name realName,
+            bd.dept_name deptName
         FROM
-            ksxt_exam
+            ksxt_exam ke
+        left join
+            blade_user bu
+        on
+            ke.creator = bu.id
+        left join
+            blade_dept bd
+        on
+            bd.id = bu.dept_id
         where
         1=1
         <if test="paper.examType!=null and paper.examType!=''">
@@ -111,6 +121,9 @@
         </if>
         <if test="paper.examName!=null and paper.examName!=''">
             and exam_name like concat('%',#{paper.examName},'%')
+        </if>
+        <if test="paper.deptId!=null and paper.deptId!=''">
+            and bd.id = #{paper.deptId}
         </if>
         <if test="paper.auditStatus!=null and paper.auditStatus!=''">
             and audit_status = #{paper.auditStatus}
@@ -283,4 +296,15 @@
         )
     </select>
 
+    <!--查询当前人员当前考试的考试题目信息-->
+    <select id="getExaminationSubjectList" resultType="org.springblade.modules.exam.vo.ExamSubjectChoicesVO">
+        SELECT esc.* FROM exam_subject_choices esc
+        left join
+        exam_examination_subject ees
+        on
+        esc.id = ees.subject_id
+        where 1=1
+        and ees.examination_id = #{examPaper.scoreId}
+    </select>
+
 </mapper>

--
Gitblit v1.9.3