From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 11 ++++++++---
1 files changed, 8 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 c8048d3..c0918be 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -8,7 +8,7 @@
sr.*,
bt.dept_name AS deptName,
bt0.dept_name AS trainUnitName,
- bu.real_name realName,bu.phone,bu.cardid idCardNo,
+ bu.real_name realName,bu.phone,bu.cardid idCardNo,bu.unit_name unitName,
ke.start_time trainExamTime,if(ke.audit_status=1,ke.exam_name,"") trainExamName,
ke.exam_type examType,sr.audit_status auditStatus,
"保安证" applyCard
@@ -45,6 +45,9 @@
</if>
<if test="trainingRegistration.userId!=null and trainingRegistration.userId!=''">
and sr.user_id = #{trainingRegistration.userId}
+ </if>
+ <if test="trainingRegistration.unitName!=null and trainingRegistration.unitName!=''">
+ and bu.unit_name like concat('%', #{trainingRegistration.unitName},'%')
</if>
<if test="trainingRegistration.deptId!=null and trainingRegistration.deptId!=''">
and bu.dept_id = #{trainingRegistration.deptId}
@@ -106,8 +109,7 @@
else "缺考" end as isExam,
bt.dept_name AS deptName,
bt0.dept_name AS trainUnitName,
- bu.real_name realName,
- bu.phone,bu.cardid idCardNo,
+ bu.real_name realName,bu.phone,bu.cardid idCardNo,bu.unit_name unitName,
ke.start_time trainExamTime,
if(ke.audit_status=1,ke.exam_name,"") trainExamName,
case
@@ -157,6 +159,9 @@
<if test="trainingRegistration.deptName!=null and trainingRegistration.deptName!=''">
and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
</if>
+ <if test="trainingRegistration.unitName!=null and trainingRegistration.unitName!=''">
+ and bu.unit_name like concat('%', #{trainingRegistration.unitName},'%')
+ </if>
<if test="trainingRegistration.realName!=null and trainingRegistration.realName!=''">
and bu.real_name like concat('%', #{trainingRegistration.realName},'%')
</if>
--
Gitblit v1.9.3