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 | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 1d28907..8a03685 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
- and is_exam = 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>
@@ -41,6 +43,9 @@
</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.auditStatus!=null and trainingRegistration.auditStatus!=0">
and sr.audit_status = #{trainingRegistration.auditStatus}
@@ -51,13 +56,11 @@
<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.cancel!=null">
+ and sr.cancel = #{trainingRegistration.cancel}
</if>
- <if test="trainingRegistration.cancel==2">
- and sr.cancel = 2
- and bu.is_train = 2
+ <if test="trainingRegistration.isTrain!=null">
+ and bu.is_train = #{trainingRegistration.isTrain}
</if>
</select>
@@ -152,9 +155,9 @@
</select>
<!--查询已报名培训公司未关联考试的报名信息-->
- <select id="getTrainIds" resultType="java.lang.Long">
+ <select id="getTrainIds" resultType="org.springblade.modules.training.entity.TrainingRegistration">
SELECT
- sr.id
+ sr.id,sr.train_exam_id trainExamId
FROM
sys_training_registration sr
LEFT JOIN
--
Gitblit v1.9.3