From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增，报名查询，报名清册，培训报名，培训报名查询修改
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 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 47bc82f..14e68cf 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -5,10 +5,11 @@
<!--报名培训分页信息-->
<select id="selectTrainingRegistrationPage" resultType="org.springblade.modules.training.vo.TrainingRegistrationVo">
SELECT
- sr.*,
+ sr.id,sr.training_time trainingTime,sr.user_id userId,sr.cancel,
bt.dept_name AS deptName,
bt0.dept_name AS trainUnitName,
- bu.real_name realName,bu.phone,bu.cardid idCardNo,
+ bu.real_name realName,bu.cardid idCardNo,ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(bu.cardid,7,4),0) age,
+ bu.sex,bu.phone,bu.nativePlace,
ke.start_time trainExamTime,if(ke.audit_status=1,ke.exam_name,"") trainExamName,
ke.exam_type examType,sr.audit_status auditStatus,
"保安证" applyCard
@@ -19,7 +20,12 @@
ON
sr.training_unit_id = bt0.id
left join
- blade_user bu
+ (
+ select * from blade_user where 1=1
+ <if test="trainingRegistration.deptId!=null and trainingRegistration.deptId!=''">
+ and dept_id = #{trainingRegistration.deptId}
+ </if>
+ ) bu
on
sr.user_id = bu.id
LEFT JOIN
@@ -32,7 +38,21 @@
ke.id = sr.train_exam_id
WHERE
1=1
- and is_exam = 1
+ <if test="trainingRegistration.cancel==1">
+ and sr.cancel = 1
+ and bu.is_train = 1
+ </if>
+ <if test="trainingRegistration.cancel==2">
+ and sr.cancel = 2
+ </if>
+ <if test="trainingRegistration.cancel==11">
+ and (
+ sr.cancel = 2
+ )
+ or
+ (sr.cancel = 1
+ and bu.is_train = 1)
+ </if>
<if test="trainingRegistration.trainingUnitId!=null and trainingRegistration.trainingUnitId!=''">
and sr.training_unit_id = #{trainingRegistration.trainingUnitId}
</if>
@@ -41,6 +61,12 @@
</if>
<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.idCardNo!=null and trainingRegistration.idCardNo!=''">
+ and bu.cardid like concat('%', #{trainingRegistration.idCardNo},'%')
</if>
<if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
and sr.audit_status = #{trainingRegistration.auditStatus}
@@ -51,14 +77,13 @@
<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 test="trainingRegistration.beginTime!=null and trainingRegistration.beginTime!=''">
+ and sr.training_time >= #{trainingRegistration.beginTime}
</if>
- <if test="trainingRegistration.cancel==2">
- and sr.cancel = 2
- and bu.is_train = 2
+ <if test="trainingRegistration.overTime!=null and trainingRegistration.overTime!=''">
+ and sr.training_time <= #{trainingRegistration.overTime}
</if>
+ and is_exam = 1
</select>
<!--报名培训详情信息-->
--
Gitblit v1.9.3