From a71aa365550b036e3689cb492b45fa1ecf577a4c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 04 Dec 2021 16:45:16 +0800
Subject: [PATCH] 统计查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 63 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 20 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 1c06f2e..ec1ed1a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -177,11 +177,18 @@
</if>
<if test="user.examinationType!=null and user.examinationType != ''">
<if test="user.examinationType == 0">
- and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type ='')
+ 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>
+ <if test="user.types!=null and user.types=='1'.toString()">
+ and to_days(bu.audit_time) = to_days(now())
+ </if>
+ <if test="user.types!=null and user.types=='2'.toString()">
+ and DATE_FORMAT(bu.audit_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
</if>
<if test="user.sex!=null and user.sex != ''">
and bu.sex = #{user.sex}
@@ -215,15 +222,20 @@
blade_role br
on
br.id = bu.role_id
+ left join
+ sys_information si
+ on
+ bd.id = si.departmentid
+ 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.cardid!=null and user.cardid != ''">
and bu.cardid like concat(concat('%', #{user.cardid}),'%')
</if>
@@ -235,6 +247,18 @@
</if>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
+ </if>
+ <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
+ </if>
+ <if test="user.dispatch!=null and user.dispatch != ''">
+ and bu.dispatch = #{user.dispatch}
+ </if>
+ <if test="user.soil!=null and user.soil != ''">
+ and bu.soil = #{user.soil}
+ </if>
+ <if test="user.insurance!=null and user.insurance != ''">
+ and bu.insurance = #{user.insurance}
</if>
<if test="user.userType!=null and user.userType != ''">
and bu.user_type = #{user.userType}
@@ -257,7 +281,7 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber like concat('%', #{user.securitynumber},'%')
</if>
- <if test="user.deptId!=null and user.deptId!=''">
+ <if test="user.deptId!=null and user.deptId!='' and user.deptId!='1460129345988239362'">
and bu.dept_id =#{user.deptId}
</if>
<if test="user.type!=null">
@@ -302,7 +326,9 @@
<update id="updateUser">
update blade_user
- set hold=#{hold},holdv=#{holdv},holdvtime=#{time}
+ set hold=#{hold},
+ holdv=#{holdv},
+ holdvtime=#{time}
where cardid = #{cardid}
</update>
@@ -322,16 +348,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>
@@ -340,10 +364,9 @@
SELECT id, name, real_name RealName
FROM blade_user
where cardid = #{param1}
- and is_deleted = 0
- and status = 1
+ and is_deleted = 0
+ and status = 1
</select>
-
<select id="selectPeo" resultType="java.util.HashMap">
@@ -378,7 +401,7 @@
and bd.parent_id!=1425365577303621633
and bd.id != 1425365577303621633
and bd.id != 1432625856013971457
- <if test="user.deptId!=null and user.deptId!=''">
+ <if test="user.deptId!=null and user.deptId!='' and user.deptId!='1460129345988239362'">
and bd.id in
(
select id from blade_dept where id = #{user.deptId}
--
Gitblit v1.9.3