From 247abfbc0b322a04f8dc5fcf01fe7989b25fd7e9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 04 Nov 2021 10:35:29 +0800
Subject: [PATCH] 保安员发证时间更新接口新增
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 59 ++++++++---------------------------------------------------
1 files changed, 8 insertions(+), 51 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index cc4e627..1fa857b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -53,6 +53,7 @@
<!--带坐标-->
<select id="selectUserPages" resultMap="userResultMap">
select
+ distinct
bu.*,
sll.longitude,sll.latitude,
bd.dept_name
@@ -78,6 +79,10 @@
blade_role br
on
br.id = bu.role_id
+ left join
+ sys_training_registration str
+ on
+ bu.id = str.user_id
where
bu.is_deleted = 0
and bd.parent_id!=1425365577303621633
@@ -100,6 +105,9 @@
</if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
+ </if>
+ <if test="user.trainingUnitId!=null and user.trainingUnitId != ''">
+ and str.training_unit_id = #{user.trainingUnitId}
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
@@ -577,55 +585,4 @@
</select>
- <!--导出保安员证信息-->
- <select id="exportSecurityPaperList" resultType="org.springblade.modules.system.vo.UserVO">
- select
- bu.*,bd.dept_name deptName
- from
- blade_user bu
- left join
- blade_dept bd
- on
- bu.dept_id = bd.id
- left join
- blade_role br
- on
- br.id = bu.role_id
- where
- bu.is_deleted = 0
- and role_alias = '保安'
- <if test="user.realName!=null and user.realName != ''">
- and bu.real_name like concat(concat('%', #{user.realName}),'%')
- </if>
- <if test="user.userType!=null and user.userType != ''">
- and bu.user_type = #{user.userType}
- </if>
- <if test="user.nativeplace!=null and user.nativeplace != ''">
- and bu.nativeplace = #{user.nativeplace}
- </if>
- <if test="user.deptId!=null and user.deptId != ''">
- and bu.dept_id = #{user.deptId}
- </if>
- <if test="user.sex!=null and user.sex != ''">
- and bu.sex = #{user.sex}
- </if>
- <if test="user.dispatch!=null and user.dispatch != ''">
- <if test="user.dispatch==1">
- and (bu.dispatch = #{user.dispatch} or bu.dispatch is null)
- </if>
- <if test="user.dispatch==0">
- and bu.dispatch = #{user.dispatch}
- </if>
- </if>
- <if test="user.status!=null and user.status != ''">
- and bu.status = #{user.status}
- </if>
- <if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and bu.jurisdiction = #{user.jurisdiction}
- </if>
- <if test="user.securitynumber!=null and user.securitynumber != ''">
- and bu.securitynumber = #{user.securitynumber}
- </if>
- ORDER BY bu.id
- </select>
</mapper>
--
Gitblit v1.9.3