From c2be0ff46be605d55152465e2d5c100d060c5ceb Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Nov 2021 17:26:32 +0800
Subject: [PATCH] 1.押运屏蔽
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 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 fbf2038..11635d5 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -148,15 +148,19 @@
<select id="selectUserPages" resultMap="userResultMaps">
select
bu.*,
- ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( cardid,7,4),0) 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 != '1372091709474910209'">
- 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>
@@ -221,6 +228,9 @@
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>
@@ -236,20 +246,26 @@
<if test="user.sex!=null and user.sex != ''">
and bu.sex = #{user.sex}
</if>
+ <if test="user.examinationType==0">
+ and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")
+ </if>
+ <if test="user.examinationType==1">
+ and bu.examination_type = #{user.examinationType}
+ </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.type!=null">
+ and bu.equipment_code !="" and bu.equipment_code is not null and bu.equipment_code !=null
+ </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 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}
@@ -258,7 +274,7 @@
and bu.paper_time <= #{user.endTime}
</if>
<if test="user.useName==null or user.useName==''">
- order by bu.id
+ order by bu.examination_type desc,bu.id
</if>
<if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
order by bu.examination_type ${user.sort}
@@ -316,16 +332,14 @@
<!--根据保安员编码查询保安信息-->
<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
+ 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>
@@ -338,7 +352,7 @@
bu.cardid,
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
bu.phone,
- if(bu.examination_type=0,'正常','异常') examinationType,
+ if(bu.examination_type=1,'异常','正常') examinationType,
bu.examination_mx examinationMx,
bu.paper_time paperTime
from
@@ -396,7 +410,7 @@
and bu.securitynumber like concat('%', #{user.securitynumber},'%')
</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.startTime!=null and user.startTime!=''">
and bu.paper_time >= #{user.startTime}
@@ -404,8 +418,14 @@
<if test="user.endTime!=null and user.endTime!=''">
and bu.paper_time <= #{user.endTime}
</if>
+ <if test="user.examinationType==0">
+ and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")
+ </if>
+ <if test="user.examinationType==1">
+ and bu.examination_type = #{user.examinationType}
+ </if>
<if test="user.useName==null or user.useName==''">
- order by bu.id
+ order by bu.examination_type desc,bu.id
</if>
<if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
order by bu.examination_type ${user.sort}
--
Gitblit v1.9.3