From 138cac5008689fadaa96ecac116a2297bb69bc1c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 04 Mar 2022 10:45:40 +0800
Subject: [PATCH] 1. 电子围栏基本接口新增 2. 保安员证核查申请记录基本接口新增，审批，批量审批接口编写 3. 保安员证档案库新增字段 source 来源，保安员证生成修改
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 f415f7b..1577741 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -30,6 +30,8 @@
ksxt_exam ke
on
ke.id = sr.train_exam_id
+ left join sys_information si on si.departmentid = bt.id
+ left join sys_jurisdiction sj on si.jurisdiction = sj.id
WHERE
1=1
<if test="trainingRegistration.isExam!=null and trainingRegistration.isExam!=0">
@@ -50,6 +52,9 @@
<if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
and sr.audit_status = #{trainingRegistration.auditStatus}
</if>
+ <if test="trainingRegistration.vipStatus!=null and trainingRegistration.vipStatus!=0">
+ and sr.vip_status = #{trainingRegistration.vipStatus}
+ </if>
<if test="trainingRegistration.deptName!=null and trainingRegistration.deptName!=''">
and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
</if>
@@ -64,6 +69,9 @@
</if>
<if test="trainingRegistration.isTrain!=null">
and bu.is_train = #{trainingRegistration.isTrain}
+ </if>
+ <if test="trainingRegistration.jurisdiction!=null and trainingRegistration.jurisdiction!='' and trainingRegistration.jurisdiction!='1372091709474910209'">
+ and (sj.id=#{trainingRegistration.jurisdiction} or sj.parent_id = #{trainingRegistration.jurisdiction})
</if>
order by sr.id desc
</select>
@@ -267,6 +275,8 @@
ke.id = sr.train_exam_id
WHERE
1=1
+ and bu.is_deleted = 0
+ and bu.status = 1
<if test="trainingRegistration.isExam!=null">
and is_exam = #{trainingRegistration.isExam}
</if>
--
Gitblit v1.9.3