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 | 93 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 46 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..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
@@ -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
@@ -90,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}
@@ -100,6 +105,12 @@
</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.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 (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
@@ -132,19 +143,22 @@
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
+ 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}),'%')
@@ -219,7 +233,7 @@
<!--保安员列表-->
<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
@@ -389,7 +403,7 @@
<!--计算保安人员年龄-->
<select id="getUserAgeById" resultType="org.springblade.modules.system.vo.UserVO">
- select id,ifnull(TIMESTAMPDIFF(YEAR, birthday, CURDATE()),0) age,securitynumber,cardid
+ select id,ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid,7,4),0) age,securitynumber,cardid
from
blade_user
where
@@ -576,11 +590,23 @@
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
+ )
- <!--导出保安员证信息-->
- <select id="exportSecurityPaperList" resultType="org.springblade.modules.system.vo.UserVO">
+ union all
+
+ (
select
- bu.*,bd.dept_name deptName
+ distinct
+ bu.id,
+ bu.real_name as name,
+ #{user.deptId} parentId
from
blade_user bu
left join
@@ -593,39 +619,14 @@
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
+ 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