From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 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 821922c..8a03685 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -9,7 +9,8 @@
bt.dept_name AS deptName,
bt0.dept_name AS trainUnitName,
bu.real_name realName,bu.phone,bu.cardid idCardNo,
- ke.start_time trainExamTime,if(ke.audit_status=1,ke.exam_name,"") trainExamName,ke.exam_type examType,
+ ke.start_time trainExamTime,if(ke.audit_status=1,ke.exam_name,"") trainExamName,
+ ke.exam_type examType,sr.audit_status auditStatus,
"保安证" applyCard
FROM
sys_training_registration sr
@@ -31,9 +32,9 @@
ke.id = sr.train_exam_id
WHERE
1=1
- and is_exam = 1
- and bu.is_train = 1
- and sr.cancel = 1
+ <if test="trainingRegistration.isExam!=null">
+ and is_exam = #{trainingRegistration.isExam}
+ </if>
<if test="trainingRegistration.trainingUnitId!=null and trainingRegistration.trainingUnitId!=''">
and sr.training_unit_id = #{trainingRegistration.trainingUnitId}
</if>
@@ -43,6 +44,12 @@
<if test="trainingRegistration.userId!=null and trainingRegistration.userId!=''">
and sr.user_id = #{trainingRegistration.userId}
</if>
+ <if test="trainingRegistration.deptId!=null and trainingRegistration.deptId!=''">
+ and bu.dept_id = #{trainingRegistration.deptId}
+ </if>
+ <if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
+ and sr.audit_status = #{trainingRegistration.auditStatus}
+ </if>
<if test="trainingRegistration.deptName!=null and trainingRegistration.deptName!=''">
and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
</if>
@@ -51,6 +58,9 @@
</if>
<if test="trainingRegistration.cancel!=null">
and sr.cancel = #{trainingRegistration.cancel}
+ </if>
+ <if test="trainingRegistration.isTrain!=null">
+ and bu.is_train = #{trainingRegistration.isTrain}
</if>
</select>
@@ -145,20 +155,56 @@
</select>
<!--查询已报名培训公司未关联考试的报名信息-->
- <select id="getTrainIds" resultType="java.lang.Long">
+ <select id="getTrainIds" resultType="org.springblade.modules.training.entity.TrainingRegistration">
SELECT
- str.id
+ sr.id,sr.train_exam_id trainExamId
FROM
- sys_training_registration str
+ sys_training_registration sr
+ LEFT JOIN
+ blade_dept bt0
+ ON
+ sr.training_unit_id = bt0.id
left join
blade_user bu
on
- str.user_id = bu.id
+ 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 str.is_exam = 1
- and str.cancel = 1
- and bu.is_train = 1
- and str.train_exam_id is null
+ and is_exam = 1
+ <if test="trainingRegistration.trainingUnitId!=null and trainingRegistration.trainingUnitId!=''">
+ and sr.training_unit_id = #{trainingRegistration.trainingUnitId}
+ </if>
+ <if test="trainingRegistration.examId!=null and trainingRegistration.examId!=''">
+ and ke.id = #{trainingRegistration.examId}
+ </if>
+ <if test="trainingRegistration.userId!=null and trainingRegistration.userId!=''">
+ and sr.user_id = #{trainingRegistration.userId}
+ </if>
+ <if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
+ and sr.audit_status = #{trainingRegistration.auditStatus}
+ </if>
+ <if test="trainingRegistration.deptName!=null and trainingRegistration.deptName!=''">
+ and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
+ </if>
+ <if test="trainingRegistration.realName!=null and trainingRegistration.realName!=''">
+ and bu.real_name like concat('%', #{trainingRegistration.realName},'%')
+ </if>
+ <if test="trainingRegistration.cancel==1">
+ and sr.cancel = 1
+ and bu.is_train = 1
+ </if>
+ <if test="trainingRegistration.cancel==2">
+ and sr.cancel = 2
+ and bu.is_train = 2
+ </if>
+ limit #{trainingRegistration.serialStart},#{trainingRegistration.serialEnd}
</select>
</mapper>
--
Gitblit v1.9.3