From 8d43111bd0e598bc0b2014cbfa69a32e74959dff Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Dec 2021 19:24:05 +0800
Subject: [PATCH] ftp sql 同步封装

---
 src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml |  116 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 85 insertions(+), 31 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 a1e2cb4..dfc1bce 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -103,7 +103,8 @@
         SELECT
             ke.*,
             bu.real_name realName,
-            bd.dept_name deptName
+            bd.dept_name deptName,
+            bu1.real_name confirmUserName
         FROM
             ksxt_exam ke
         left join
@@ -114,6 +115,10 @@
             blade_dept bd
         on
             bd.id = bu.dept_id
+        left join
+            blade_user bu1
+        on
+            ke.confirm_user = bu1.id
         where
         1=1
         <if test="paper.examType!=null and paper.examType!=''">
@@ -165,33 +170,59 @@
     </delete>
 
     <!--查询考试人员考试信息-->
+<!--    <select id="getExamDetail" resultType="org.springblade.modules.exam.vo.ExamPaperVO">-->
+<!--        (select-->
+<!--            ke.id,ke.exam_name examName,ke.start_time startTime,ke.end_time endTime,ke.exam_type examType,-->
+<!--            sa.candidate_no candidateNo,sa.id applyId,-->
+<!--            bu.real_name realName,bu.sex,bu.cardid idCardNo-->
+<!--        from-->
+<!--            ksxt_exam ke-->
+<!--        left join-->
+<!--            sys_apply sa-->
+<!--        on-->
+<!--            sa.exam_id = ke.id-->
+<!--        left join-->
+<!--            blade_user bu-->
+<!--        on-->
+<!--            bu.id = sa.user_id-->
+<!--        where sa.user_id = #{userId}-->
+<!--        and is_apply = 1-->
+<!--        and is_exam = 1-->
+<!--        and sa.apply_status = 2-->
+<!--        )-->
+
+<!--        union all-->
+
+<!--        (select-->
+<!--            ke.id,ke.exam_name examName,ke.start_time startTime,ke.end_time endTime,ke.exam_type examType,-->
+<!--            str.candidate_no candidateNo,str.id applyId,-->
+<!--            bu.real_name realName,bu.sex,bu.cardid idCardNo-->
+<!--        from-->
+<!--            ksxt_exam ke-->
+<!--        left join-->
+<!--            sys_training_registration str-->
+<!--        on-->
+<!--            str.train_exam_id = ke.id-->
+<!--        left join-->
+<!--            blade_user bu-->
+<!--        on-->
+<!--            bu.id = str.user_id-->
+<!--        where str.user_id = #{userId}-->
+<!--        and bu.is_train = 1-->
+<!--        and (str.is_exam = 1 or str.is_exam = 3)-->
+<!--        and ke.audit_status = 1-->
+<!--        and str.cancel = 1-->
+<!--        and str.audit_status = 1-->
+<!--        )-->
+<!--    </select>    、-->
+
+    <!--查询考试人员考试信息-->
     <select id="getExamDetail" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
-        (select
+        select
             ke.id,ke.exam_name examName,ke.start_time startTime,ke.end_time endTime,ke.exam_type examType,
-            sa.candidate_no candidateNo,sa.id applyId,
-            bu.real_name realName,bu.sex,bu.cardid idCardNo
-        from
-            ksxt_exam ke
-        left join
-            sys_apply sa
-        on
-            sa.exam_id = ke.id
-        left join
-            blade_user bu
-        on
-            bu.id = sa.user_id
-        where sa.user_id = #{userId}
-        and is_apply = 1
-        and is_exam = 1
-        and sa.apply_status = 2
-        )
-
-        union all
-
-        (select
-            ke.id,ke.exam_name examName,ke.start_time startTime,ke.end_time endTime,ke.exam_type examType,
-            str.candidate_no candidateNo,str.id applyId,
-            bu.real_name realName,bu.sex,bu.cardid idCardNo
+            str.candidate_no candidateNo,str.id applyId,str.is_exam isExam,
+            bu.real_name realName,bu.sex,bu.cardid idCardNo,
+            es.exam_time examStartTime,es.id scoreId
         from
             ksxt_exam ke
         left join
@@ -202,13 +233,18 @@
             blade_user bu
         on
             bu.id = str.user_id
+        left join
+			exam_score es
+		on
+		es.apply_id = str.id
         where str.user_id = #{userId}
         and bu.is_train = 1
-        and is_exam = 1
+        and (str.is_exam = 1 or str.is_exam = 3)
         and ke.audit_status = 1
         and str.cancel = 1
         and str.audit_status = 1
-        )
+        and ke.start_time &lt;= now() and ke.end_time &gt; now()
+        order by str.id desc
     </select>
 
     <!--查询是当前前缀已生成准考证号码最大的一位-->
@@ -257,10 +293,14 @@
 
     <!--查询当前考试的报名人员数量,模拟考试-->
     <select id="getTrainNumber" resultType="java.lang.Integer">
-        select count(*) from sys_training_registration
+        select count(*) from sys_training_registration str
+        left join
+            blade_user bu
+        on
+            bu.id = str.user_id
         where
-        train_exam_id = #{examPaper.id}
-        and cancel = 1
+            bu.is_deleted = 0 and bu.status = 1
+        and train_exam_id = #{examPaper.id}
     </select>
 
     <!--根据用户id查询报名信息-->
@@ -324,4 +364,18 @@
         </foreach>
     </insert>
 
+    <!--查询当前考试的报名人员数量,模拟考试-->
+    <select id="getExamNumber" resultType="java.lang.Integer">
+        select count(*) from sys_training_registration str
+        left join
+            blade_user bu
+        on
+            bu.id = str.user_id
+        where
+            bu.is_deleted = 0 and bu.status = 1
+        and train_exam_id = #{examPaper.id}
+        and (is_exam = 2 or is_exam = 3)
+        and cancel = 1
+    </select>
+
 </mapper>

--
Gitblit v1.9.3