From 19f40c8e0649ae81b3f0183a6f4c8aa6c3db39bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 18 Nov 2021 17:54:37 +0800
Subject: [PATCH] 证书打印信息导出修改,已过考试的,系统每天凌晨1点定时清理,标记为缺考,并生成缺考记录,保安员导入新增年龄判断,超过60岁的不能导入

---
 src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
index 4a6d3a7..fde6c9d 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -34,7 +34,7 @@
             1=1
         and bu.status = 1
         and bu.is_deleted = 0
-        <if test="trainingRegistration.isExam!=null">
+        <if test="trainingRegistration.isExam!=null and trainingRegistration.isExam!=0">
             and is_exam = #{trainingRegistration.isExam}
         </if>
         <if test="trainingRegistration.trainingUnitId!=null and  trainingRegistration.trainingUnitId!=''">
@@ -209,4 +209,41 @@
         </if>
         limit #{trainingRegistration.serialStart},#{trainingRegistration.serialEnd}
     </select>
+
+    <!--报名培训分页信息-->
+    <select id="selectTrainingRegistrationList" resultType="org.springblade.modules.training.entity.TrainingRegistration">
+        SELECT
+        sr.*
+        FROM
+        sys_training_registration sr
+        LEFT JOIN
+        blade_dept bt0
+        ON
+        sr.training_unit_id = bt0.id
+        left join
+        blade_user bu
+        on
+        sr.user_id = bu.id
+        LEFT JOIN
+        blade_dept bt
+        ON
+        bu.dept_id = bt.id
+        left join
+        ksxt_exam ke
+        on
+        ke.id = sr.train_exam_id
+        WHERE
+        1=1
+        and bu.status = 1
+        and bu.is_deleted = 0
+        <if test="trainingRegistration.isExam!=null">
+            and is_exam = #{trainingRegistration.isExam}
+        </if>
+        <if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
+            and sr.audit_status = #{trainingRegistration.auditStatus}
+        </if>
+        <if test="trainingRegistration.cancel!=null">
+            and sr.cancel = #{trainingRegistration.cancel}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3