From 48679fc5bb7e8dc8b8d45a5d2373bd11dc612413 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Nov 2021 10:02:27 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 156 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 142 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 4613cb7..4e35814 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -97,10 +97,10 @@
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}),'%')
+ and real_name like concat('%', #{user.realName},'%')
</if>
<if test="user.deptId!=null and user.deptId != ''">
and dept_id like concat(concat('%', #{user.deptId}),'%')
@@ -148,15 +148,19 @@
<select id="selectUserPages" resultMap="userResultMaps">
select
bu.*,
- TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()) age
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
+ p.score
from
blade_user bu
left join
sys_information si
on
si.departmentid = bu.dept_id
- where is_deleted = 0
- and status = 1
+ LEFT JOIN blade_dept d ON bu.dept_id = d.id
+ LEFT JOIN sys_jurisdiction j ON j.id = si.jurisdiction
+ LEFT JOIN sys_performance p ON p.cardid = bu.cardid
+ where bu.is_deleted = 0
+ and bu.status = 1
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
@@ -178,11 +182,14 @@
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
</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 (j.id = #{user.jurisdiction} or j.parent_id = #{user.jurisdiction})
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
+ </if>
+ <if test="user.score!=null and user.score != ''">
+ and p.score = 3
</if>
ORDER BY bu.id
</select>
@@ -191,19 +198,39 @@
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMaps">
select
- bu.*,bd.dept_name as deptName
+ bu.*,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
+ bd.dept_name as 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
+ 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
and
- bd.dept_category = 1
+ br.role_alias = "安保人员"
and
bu.status = 1
+ and bd.parent_id!=1425365577303621633
+ and bd.id != 1425365577303621633
+ and bd.id != 1432625856013971457
+ <if test="user.deptId!=null and user.deptId!=''">
+ and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
+ </if>
<if test="user.cardid!=null and user.cardid != ''">
and bu.cardid like concat(concat('%', #{user.cardid}),'%')
</if>
@@ -225,14 +252,17 @@
<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 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 bu.securitynumber = #{user.securitynumber}
+ and bu.securitynumber like concat('%', #{user.securitynumber},'%')
</if>
- <if test="user.deptId!=null and user.deptId!=''">
- and bu.dept_id =#{user.deptId}
+ <if test="user.startTime!=null and user.startTime!=''">
+ and bu.paper_time >= #{user.startTime}
+ </if>
+ <if test="user.endTime!=null and user.endTime!=''">
+ and bu.paper_time <= #{user.endTime}
</if>
<if test="user.useName==null or user.useName==''">
order by bu.id
@@ -291,4 +321,102 @@
where examination_type is null
</select>
+ <!--根据保安员编码查询保安信息-->
+ <select id="getUserInfoBySecurityNumber" resultType="org.springblade.modules.system.vo.UserVO">
+ select bu.*,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid, 7, 4), 0) age,
+ bd.dept_name deptName
+ from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ where securitynumber = #{securityNumber}
+ </select>
+
+ <!--保安员列表-->
+ <select id="exportSecurity" resultType="org.springblade.modules.system.excel.SecurityExcel">
+ select
+ bu.real_name realName,
+ bd.dept_name as deptName,
+ if(bu.sex=1,'男','女') sex,
+ bu.cardid,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
+ bu.phone,
+ if(bu.examination_type=0,'正常','异常') examinationType,
+ bu.examination_mx examinationMx,
+ bu.paper_time paperTime
+ 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
+ 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
+ and
+ br.role_alias = "安保人员"
+ and
+ bu.status = 1
+ and bd.parent_id!=1425365577303621633
+ and bd.id != 1425365577303621633
+ and bd.id != 1432625856013971457
+ <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.cardid!=null and user.cardid != ''">
+ and bu.cardid like concat(concat('%', #{user.cardid}),'%')
+ </if>
+ <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.sex!=null and user.sex != ''">
+ and bu.sex = #{user.sex}
+ </if>
+ <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.securitynumber!=null and user.securitynumber != ''">
+ and bu.securitynumber like concat('%', #{user.securitynumber},'%')
+ </if>
+ <if test="user.deptId!=null and user.deptId!=''">
+ and bu.dept_id =#{user.deptId}
+ </if>
+ <if test="user.startTime!=null and user.startTime!=''">
+ and bu.paper_time >= #{user.startTime}
+ </if>
+ <if test="user.endTime!=null and user.endTime!=''">
+ and bu.paper_time <= #{user.endTime}
+ </if>
+ <if test="user.useName==null or user.useName==''">
+ order by bu.id
+ </if>
+ <if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
+ order by bu.examination_type ${user.sort}
+ </if>
+ <if test="user.useName!=null and user.useName!='' and user.useName=='examinationMx'">
+ order by bu.examination_mx ${user.sort}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3