From 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Nov 2021 15:46:35 +0800
Subject: [PATCH] 证书打印信息导出修改

---
 src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml |   56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 9 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 ab191c8..a1e2cb4 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}
@@ -198,19 +211,16 @@
         )
     </select>
 
-    <!--查询前缀相同的准考证数量-->
+    <!--查询是当前前缀已生成准考证号码最大的一位-->
     <select id="getCandidateNoCount" resultType="java.lang.Integer">
-        select count(*) from sys_training_registration
-        where 1=1
-        <if test="result!=null and result!=''">
-            and candidate_no like concat('%', #{result},'%')
-        </if>
+        select ifnull(max(0+RIGHT(candidate_no,4)),0) from sys_training_registration
+        where candidate_no like concat('%', #{result},'%')
     </select>
 
     <!--查询当前考试已报名的人员培训报名数据集合-->
     <select id="getTrainList" resultType="org.springblade.modules.training.entity.TrainingRegistration">
         SELECT
-        str.id
+        str.id,str.user_id userId
         FROM
         sys_training_registration str
         left join
@@ -286,4 +296,32 @@
         )
     </select>
 
+    <!--查询当前人员当前考试的考试题目信息-->
+    <select id="getExaminationSubjectList" resultType="org.springblade.modules.exam.vo.ExamSubjectChoicesVO">
+        SELECT
+            esc.id,esc.category_id,esc.subject_name,esc.choices_type,esc.score,esc.level
+        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>
+
+    <!--批量新增考生考题信息-->
+    <insert id="insertBatch" parameterType="java.util.List">
+        insert into exam_examination_subject
+        (examination_id,category_id,subject_id)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (
+                #{item.examinationId},
+                #{item.categoryId},
+                #{item.subjectId}
+            )
+        </foreach>
+    </insert>
+
 </mapper>

--
Gitblit v1.9.3