From 116143f2237156ff892d6951d6943285fa304f0e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Dec 2021 17:33:23 +0800
Subject: [PATCH] 考试成绩查询，导出修改，实操成绩导入去除准考证号，保安员导入新增身份证住址校验
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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 8a03685..3d5352d 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -32,7 +32,9 @@
ke.id = sr.train_exam_id
WHERE
1=1
- <if test="trainingRegistration.isExam!=null">
+ and bu.status = 1
+ and bu.is_deleted = 0
+ <if test="trainingRegistration.isExam!=null and trainingRegistration.isExam!=0">
and is_exam = #{trainingRegistration.isExam}
</if>
<if test="trainingRegistration.trainingUnitId!=null and trainingRegistration.trainingUnitId!=''">
@@ -56,12 +58,16 @@
<if test="trainingRegistration.realName!=null and trainingRegistration.realName!=''">
and bu.real_name like concat('%', #{trainingRegistration.realName},'%')
</if>
- <if test="trainingRegistration.cancel!=null">
+ <if test="trainingRegistration.idCardNo!=null and trainingRegistration.idCardNo!=''">
+ and bu.cardid like concat('%', #{trainingRegistration.idCardNo},'%')
+ </if>
+ <if test="trainingRegistration.cancel!=null and trainingRegistration.cancel!=0">
and sr.cancel = #{trainingRegistration.cancel}
</if>
<if test="trainingRegistration.isTrain!=null">
and bu.is_train = #{trainingRegistration.isTrain}
</if>
+
</select>
<!--报名培训详情信息-->
@@ -123,6 +129,9 @@
</if>
<if test="trainingRegistration.realName!=null and trainingRegistration.realName!=''">
and bu.real_name like concat('%', #{trainingRegistration.realName},'%')
+ </if>
+ <if test="trainingRegistration.idCardNo!=null and trainingRegistration.idCardNo!=''">
+ and bu.cardid like concat('%', #{trainingRegistration.idCardNo},'%')
</if>
<if test="trainingRegistration.cancel!=null">
and sr.cancel = #{trainingRegistration.cancel}
@@ -207,4 +216,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