From 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Nov 2021 15:46:35 +0800
Subject: [PATCH] 证书打印信息导出修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 159 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 145 insertions(+), 14 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 c0dc0cb..822efbb 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -53,7 +53,8 @@
<!--带坐标-->
<select id="selectUserPages" resultMap="userResultMap">
select
- bu.*,
+ distinct
+ bu.*,IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sexs,
sll.longitude,sll.latitude,
bd.dept_name
from
@@ -67,6 +68,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
@@ -74,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
@@ -86,7 +95,7 @@
and bu.hold = #{user.hold}
</if>
<if test="user.deptId!=null and user.deptId != ''">
- and bu.dept_id = #{user.deptId}
+ and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
@@ -97,8 +106,14 @@
<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.deptName!=null and user.deptName != ''">
+ and bd.dept_name like concat('%', #{user.deptName},'%')
+ </if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
- and si.jurisdiction = #{user.jurisdiction}
+ 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},'%')
@@ -122,18 +137,34 @@
</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_jurisdiction sj
+ on
+ sj.id = bu.jurisdiction
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
+ 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 like concat('%', #{user.account},'%')
</if>
+ <if test="user.roleId!=null and user.roleId != ''">
+ and br.role_alias = '公安管理员'
+ </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}
@@ -149,8 +180,9 @@
</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 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}
@@ -158,7 +190,7 @@
<if test="user.examinationType!=null and user.examinationType != ''">
and examination_type = #{user.examinationType}
</if>
- ORDER BY id
+ ORDER BY bu.id
</select>
<select id="getUser" resultMap="userResultMap">
@@ -168,6 +200,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">
@@ -188,16 +221,19 @@
<!--通过 身份证号查询用户信息-->
<select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
- SELECT id, name, real_name RealName
+ SELECT id, name, real_name RealName,securitynumber
FROM blade_user
- where cardid = #{param1}
+ where 1=1
+ and is_deleted = 0
+ and status = 1
+ and cardid = #{param1}
</select>
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMap">
select
- bu.*
+ bu.*,IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sexs
from
blade_user bu
left join
@@ -256,10 +292,15 @@
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
(hold = 2 or hold = 3)
+ and br.role_alias = "保安"
<if test="user.deptId!=null and user.deptId != ''">
and bu.dept_id = #{user.deptId}
</if>
@@ -308,12 +349,17 @@
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
+ 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>
@@ -357,7 +403,11 @@
<!--计算保安人员年龄-->
<select id="getUserAgeById" resultType="org.springblade.modules.system.vo.UserVO">
- select id,ifnull(TIMESTAMPDIFF(YEAR, birthday, CURDATE()),0) age from blade_user where id = #{userId}
+ select id,ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid,7,4),0) age,securitynumber,cardid
+ from
+ blade_user
+ where
+ id = #{userId}
</select>
@@ -487,7 +537,10 @@
<!--查询账号相同的数量-->
<select id="selectCountAccount" resultType="java.lang.Integer">
- select count(*) from blade_user where account = #{account}
+ select count(*) from blade_user where 1=1
+ and status = 1
+ and is_deleted = 0
+ and account = #{account}
</select>
<!--查询当前部门名称及父级部门名称-->
@@ -498,4 +551,82 @@
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>
+
+
+ <!--现场检查获取保安员-->
+ <select id="getSecurityInfo" resultType="java.util.HashMap">
+ select bu.*,si.jurisdiction from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ left join
+ sys_information si
+ on
+ bd.id = si.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
+ where
+ 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
+ </if>
+ and bu.status = 1
+ and bu.is_deleted = 0
+ and br.role_alias = "保安"
+ </select>
+
+ <!--保安员列表树 安员列表树，帅选无保安证,下拉tree-->
+ <select id="getSecurityDispatcherTree" resultType="org.springblade.modules.system.node.TreeNode">
+ (
+ select #{user.deptId} as id,
+ '全选' as name,
+ 0 as parentId
+ from blade_user
+ )
+
+ union all
+
+ (
+ 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 bd.is_deleted = 0
+ and bd.id = #{user.deptId}
+ and br.role_alias = '保安'
+ and bu.dispatch = 1
+ )
+ </select>
+
+
+
</mapper>
--
Gitblit v1.9.3