From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 172 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 112 insertions(+), 60 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..76e8469 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -47,6 +47,7 @@
<result column="birthtime" property="birthtime"/>
<result column="healstats" property="healstats"/>
<result column="soil" property="soil"/>
+ <result column="reason_for_leav" property="reasonForLeav"/>
</resultMap>
<!--带坐标-->
@@ -66,6 +67,10 @@
on
si.departmentid = bd.id
left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ left join
sys_live_location sll
on
sll.worker_id = bu.id
@@ -75,8 +80,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,8 +101,8 @@
<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'">
- and si.jurisdiction = #{user.jurisdiction}
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
</if>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat('%', #{user.realName},'%')
@@ -118,18 +126,31 @@
</select>
<select id="selectUserPage" resultMap="userResultMap">
- select * from blade_user where is_deleted = 0
+ select bu.* from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ left join
+ sys_information si
+ on
+ si.departmentid = bd.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ where bu.is_deleted = 0
<if test="user.tenantId!=null and user.tenantId != ''">
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}),'%')
</if>
<if test="user.deptId!=null and user.deptId != ''">
- and dept_id like concat(concat('%', #{user.deptId}),'%')
+ and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
</if>
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
@@ -145,29 +166,17 @@
</if>
<if test="user.hold!=null and user.hold != ''">
and hold = #{user.hold}
- </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and jurisdiction = #{user.jurisdiction}
- </if>
+ </if>
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
+ </if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and securitynumber = #{user.securitynumber}
</if>
<if test="user.examinationType!=null and user.examinationType != ''">
and examination_type = #{user.examinationType}
</if>
- <if test="deptIdList!=null and deptIdList.size>0">
- and id in (
- SELECT
- user_id
- FROM
- blade_user_dept
- WHERE
- dept_id IN
- <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
- )
- </if>
- ORDER BY id
+ ORDER BY bu.id
</select>
<select id="getUser" resultMap="userResultMap">
@@ -177,6 +186,7 @@
and account = #{param2}
and password = #{param3}
and is_deleted = 0
+ and status = 1
</select>
<select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
@@ -213,10 +223,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 +256,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>
@@ -265,17 +275,20 @@
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
(hold = 2 or hold = 3)
+ and br.role_alias = "保安"
<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 +311,44 @@
<!--保安员列表树 安员列表树，帅选无保安证,下拉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
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
+ where
+ bu.is_deleted = 0
+ and bu.status = 1
+ and (bu.examination_type != 1 or bu.examination_type is null)
+ and (hold = 2 or hold = 3)
+ and bd.id = #{user.deptId}
+ and br.role_alias = '保安'
+ <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 +393,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 +458,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 +471,7 @@
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
and si.jurisdiction = #{jurisdiction}
- and dept_category=2
+ and br.role_alias = "公安管理员"
</if>
</select>
@@ -456,6 +483,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 +496,7 @@
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
and bu.jurisdiction = #{jurisdiction}
- and dept_category=2
+ and br.role_alias = "公安管理员"
</if>
</select>
@@ -483,4 +514,25 @@
and sd.status = 0
</select>
+ <!--查询账号相同的数量-->
+ <select id="selectCountAccount" resultType="java.lang.Integer">
+ select count(*) from blade_user where account = #{account}
+ </select>
+
+ <!--查询当前部门名称及父级部门名称-->
+ <select id="getDeptName" resultType="java.lang.String">
+ (select dept_name from blade_dept where id = #{deptId} and 1=1)
+ union
+ (
+ select dept_name from blade_dept where id = (select parent_id from blade_dept where id= #{deptId} and 1=1)
+ )
+ </select>
+
+ <!--查询用户表中未删除，未离职的用户信息-->
+ <select id="getUserInfo" resultType="org.springblade.modules.system.entity.User">
+ select id,account from blade_user
+ where account = #{account}
+ and is_deleted = 0
+ and status = 1
+ </select>
</mapper>
--
Gitblit v1.9.3