From d3503e14d4af528d462afdefc67456f50721fbdd Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 14 Sep 2021 09:56:17 +0800
Subject: [PATCH] 智能分析统计接口辖区id更改，本市保安公司辖区id修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 98 +++++++++++++++++++++++++++++--------------------
1 files changed, 58 insertions(+), 40 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 d61feb3..e08b0f0 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -75,8 +75,11 @@
br.id = bu.role_id
where
bu.is_deleted = 0
+ and bd.parent_id!=1425365577303621633
+ and bd.id != 1425365577303621633
+ and bd.id != 1432625856013971457
<if test="user.account!=null and user.account != ''">
- and bu.account = #{user.account}
+ and bu.account like concat('%', #{user.account},'%')
</if>
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
@@ -93,7 +96,7 @@
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
</if>
- <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1123598813738675201'">
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.realName!=null and user.realName != ''">
@@ -123,7 +126,7 @@
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account != #{user.account}
+ and account like concat('%', #{user.account},'%')
</if>
<if test="user.realName!=null and user.realName != ''">
and real_name like concat(concat('%', #{user.realName}),'%')
@@ -213,10 +216,13 @@
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
- bd.dept_category = 1
+ and role_alias = '保安'
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
@@ -243,9 +249,6 @@
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
</if>
- <if test="user.hold!=null and user.hold != ''">
- and bu.hold = #{user.hold}
- </if>
<if test="user.jurisdiction!=null and user.jurisdiction != ''">
and bu.jurisdiction = #{user.jurisdiction}
</if>
@@ -268,14 +271,12 @@
where
bu.is_deleted = 0
and
- bd.dept_category = 1
- and
(hold = 2 or hold = 3)
<if test="user.deptId!=null and user.deptId != ''">
and bu.dept_id = #{user.deptId}
</if>
<if test="user.isApply!=null">
- and sa.is_apply = #{user.isApply}
+ and bu.is_apply = #{user.isApply}
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
@@ -298,30 +299,39 @@
<!--保安员列表树 安员列表树，帅选无保安证,下拉tree-->
<select id="getSecurityApplyTree" resultType="org.springblade.modules.system.node.TreeNode">
- (select #{user.deptId} as id,
- '全部' as name,
- 0 as parentId
- from blade_user)
+ (
+ select #{user.deptId} as id,
+ '全部' as name,
+ 0 as parentId
+ from blade_user
+ )
union all
- (select
- bu.id,
- bu.real_name as name,
- #{user.deptId} parentId
- from
- blade_user bu
- left join
- blade_dept bd
- on
- bu.dept_id = bd.id
- where
- bu.is_deleted = 0
- and
- bd.dept_category = 1
- and
- (hold = 2 or hold = 3)
- and bd.id = #{user.deptId}
+ (
+ select
+ distinct
+ bu.id,
+ bu.real_name as name,
+ #{user.deptId} parentId
+ from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ where
+ bu.is_deleted = 0
+ and bu.status = 1
+ and bu.examination_type != 1
+ and (hold = 2 or hold = 3)
+ and bd.id = #{user.deptId}
+ <if test="user.examType==1">
+ and bu.is_apply != 1
+ </if>
+ <if test="user.examType==2">
+ and bu.is_train != 1
+ </if>
)
</select>
@@ -366,12 +376,8 @@
<!--根据保安员编码查询保安信息-->
<select id="getUserInfoBySecurityNumber" resultType="org.springblade.modules.system.vo.UserVO">
select
- bu.id,
- bu.avatar,
- bu.securitynumber securityNumber,
- ifnull(TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()),0) age,
- bu.real_name realName,
- bu.sex,
+ bu.*,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( cardid,7,4),0) age,
bd.dept_name deptName
from
blade_user bu
@@ -435,6 +441,10 @@
sys_information si
on
bd.id = si.departmentid
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
1=1
and bu.status = 1
@@ -444,7 +454,7 @@
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
and si.jurisdiction = #{jurisdiction}
- and dept_category=2
+ and br.role_alias = "公安管理员"
</if>
</select>
@@ -456,6 +466,10 @@
blade_dept bd
on
bd.id = bu.dept_id
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
1=1
and bu.status = 1
@@ -465,7 +479,7 @@
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
and bu.jurisdiction = #{jurisdiction}
- and dept_category=2
+ and br.role_alias = "公安管理员"
</if>
</select>
@@ -483,4 +497,8 @@
and sd.status = 0
</select>
+ <!--查询账号相同的数量-->
+ <select id="selectCountAccount" resultType="java.lang.Integer">
+ select count(*) from blade_user where account = #{account}
+ </select>
</mapper>
--
Gitblit v1.9.3