From 70ab81f5211897dc0733535a933631b59df9964f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 21:04:26 +0800
Subject: [PATCH] 报名接口修改，考试接口修改，用户新增审查接口修改
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 30 ++++++++++++++++++++----------
1 files changed, 20 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..1cee915 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,
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
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,27 @@
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.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.deptName!=null and trainingRegistration.deptName!=''">
and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
--
Gitblit v1.9.3