From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 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 7f9c608..ad717f0 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -5,17 +5,14 @@
<!--报名培训分页信息-->
<select id="selectTrainingRegistrationPage" resultType="org.springblade.modules.training.vo.TrainingRegistrationVo">
SELECT
- sr.*,
+ sr.id,sr.training_time TrainingTime,sr.cancel,sr.audit_status auditStatus,
bt.dept_name AS deptName,
bt0.dept_name AS trainUnitName,
- bu.real_name realName,bu.phone,bu.cardid idCardNo,
- ste.start_time trainExamTime,ste.train_exam_name trainExamName
+ bu.real_name realName,bu.phone,bu.cardid idCardNo,bu.sex,bu.height,bu.education,
+ ke.start_time trainExamTime,if(ke.audit_status=1,ke.exam_name,"") trainExamName,ke.exam_type examType,
+ "保安证" applyCard,bu.examination_type examinationType,bu.examination_mx examinationMx,bu.audit_time auditTime
FROM
sys_training_registration sr
- LEFT JOIN
- blade_dept bt
- ON
- sr.dept_id = bt.id
LEFT JOIN
blade_dept bt0
ON
@@ -24,14 +21,38 @@
blade_user bu
on
sr.user_id = bu.id
+ LEFT JOIN
+ blade_dept bt
+ ON
+ bu.dept_id = bt.id
left join
- sys_train_exam ste
+ ksxt_exam ke
on
- ste.id = sr.train_exam_id
+ 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.examinationType!=null and trainingRegistration.examinationType != ''">
+ <if test="trainingRegistration.examinationType == 0">
+ and (bu.examination_type = #{trainingRegistration.examinationType} or bu.examination_type is null or bu.examination_type ='')
+ </if>
+ <if test="trainingRegistration.examinationType == 1">
+ and bu.examination_type = #{trainingRegistration.examinationType}
+ </if>
+ </if>
<if test="trainingRegistration.trainingUnitId!=null and trainingRegistration.trainingUnitId!=''">
- and ste.dept_id = #{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.trainUnitName!=null and trainingRegistration.trainUnitName!=''">
+ and bt0.dept_name like concat('%', #{trainingRegistration.trainUnitName},'%')
</if>
<if test="trainingRegistration.deptName!=null and trainingRegistration.deptName!=''">
and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
@@ -39,9 +60,19 @@
<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}
</if>
+ <if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
+ and sr.audit_status = #{trainingRegistration.auditStatus}
+ </if>
+ <if test="trainingRegistration.examTime!=null and trainingRegistration.examTime!=''">
+ and date_format(ke.start_time,'%Y-%m-%d') = #{trainingRegistration.examTime}
+ </if>
+ order by bu.examination_type desc,ke.start_time desc,id
</select>
<!--报名培训详情信息-->
--
Gitblit v1.9.3