From 097a14bada17d8b2bc776ba0d97e6c67bf1eba89 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Sep 2021 10:30:49 +0800
Subject: [PATCH] 1.许可模板
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 821922c..01c9228 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -9,7 +9,8 @@
bt.dept_name AS deptName,
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.start_time trainExamTime,if(ke.audit_status=1,ke.exam_name,"") trainExamName,
+ ke.exam_type examType,ke.audit_status auditStatus,
"保安证" applyCard
FROM
sys_training_registration sr
@@ -50,7 +51,7 @@
and bu.real_name like concat('%', #{trainingRegistration.realName},'%')
</if>
<if test="trainingRegistration.cancel!=null">
- and sr.cancel = #{trainingRegistration.cancel}
+ and (sr.training_unit_id is null or ke.audit_status = 3)
</if>
</select>
@@ -154,11 +155,16 @@
blade_user bu
on
str.user_id = bu.id
+ left join
+ ksxt_exam ke
+ on
+ ke.id = str.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
+ and (str.train_exam_id is null or ke.audit_status = 3)
+ limit #{serialStart},#{serialEnd}
</select>
</mapper>
--
Gitblit v1.9.3