From cdb3f3546b0b3008c62a1a9d5e21dd3c0bf41b44 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 06 Sep 2021 16:55:49 +0800
Subject: [PATCH] 1.培训考试报名接口修改，取消报名接口修改 2.考试成绩查询接口修改，保安个人考试查询接口修改 3.培训查询列表修改
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 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 01c9228..1d28907 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -10,7 +10,7 @@
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.audit_status auditStatus,
+ ke.exam_type examType,sr.audit_status auditStatus,
"保安证" applyCard
FROM
sys_training_registration sr
@@ -33,8 +33,6 @@
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 sr.training_unit_id = #{trainingRegistration.trainingUnitId}
</if>
@@ -44,14 +42,22 @@
<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!=null">
- and (sr.training_unit_id is null or ke.audit_status = 3)
+ <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>
</select>
@@ -148,23 +154,54 @@
<!--查询已报名培训公司未关联考试的报名信息-->
<select id="getTrainIds" resultType="java.lang.Long">
SELECT
- str.id
+ sr.id
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
+ ksxt_exam ke
on
- ke.id = str.train_exam_id
+ 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 or ke.audit_status = 3)
- limit #{serialStart},#{serialEnd}
+ 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