From 92d375e11f68b898cd8a46cf02bcb82cd469ded5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 02 Sep 2021 11:58:02 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 177 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 126 insertions(+), 51 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 e40c8c8..785194e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -88,7 +88,7 @@
and bu.role_id = #{user.roleId}
</if>
<if test="user.roleAlias!=null and user.roleAlias != ''">
- and (br.role_alias = '保安' or br.role_alias = '未持证保安')
+ and br.role_alias = '保安'
</if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
@@ -213,10 +213,14 @@
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
- bd.dept_category = 1
+ and bd.dept_category = 1
+ and role_alias = '保安'
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
@@ -232,11 +236,16 @@
<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.hold!=null and user.hold != ''">
- and bu.hold = #{user.hold}
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != ''">
and bu.jurisdiction = #{user.jurisdiction}
@@ -290,30 +299,39 @@
<!--保安员列表树 安员列表树，帅选无保安证,下拉tree-->
<select id="getSecurityApplyTree" resultType="org.springblade.modules.system.node.TreeNode">
- (select #{user.deptId} as id,
- '全部' as name,
- 0 as parentId
- from blade_user)
+ (
+ select #{user.deptId} as id,
+ '全部' as name,
+ 0 as parentId
+ from blade_user
+ )
union all
- (select
- 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
- where
- bu.is_deleted = 0
- and
- bd.dept_category = 1
- and
- (hold = 2 or hold = 3)
- and bd.id = #{user.deptId}
+ (
+ 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
+ where
+ bu.is_deleted = 0
+ and bu.status = 1
+ and bd.dept_category = 1
+ and (hold = 2 or hold = 3)
+ and bd.id = #{user.deptId}
+ <if test="user.examType==1">
+ and bu.is_apply != 1
+ </if>
+ <if test="user.examType==2">
+ and bu.is_train != 1
+ </if>
)
</select>
@@ -326,9 +344,9 @@
</if>
</select>
- <!--查询当前年份已有的保安证编号-->
+ <!--查询当前年份已有的保安证编号,取倒数5位的最大值-->
<select id="getSecurityPaperCount" resultType="java.lang.Integer">
- select count(*) from blade_user
+ select ifnull(max(0+RIGHT(securitynumber,5)),0) from blade_user
where securitynumber like concat('%', #{pre},'%')
</select>
@@ -358,12 +376,8 @@
<!--根据保安员编码查询保安信息-->
<select id="getUserInfoBySecurityNumber" resultType="org.springblade.modules.system.vo.UserVO">
select
- bu.id,
- bu.avatar,
- bu.securitynumber securityNumber,
- ifnull(TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()),0) age,
- bu.real_name realName,
- bu.sex,
+ bu.*,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( cardid,7,4),0) age,
bd.dept_name deptName
from
blade_user bu
@@ -393,25 +407,86 @@
where bu.id = #{user.id}
</select>
- <select id="seleL" resultType="java.util.HashMap">
- SELECT
- *
- FROM
- blade_user where 1=1
- <if test="type!=null and type=='2'.toString()">
- and role_id='1414840172333842433' and `status`=1 AND is_deleted=0
- </if>
- <if test="type!=null and type=='1'.toString()">
- AND ( role_id = '1412226235153731586'
- OR role_id = '1416733602219110402') AND `status` = 1
- AND is_deleted = 0
- AND dept_id = '1425665656887545857'
- </if>
+ <!--获取派遣信息-->
+ <select id="getDispaterInfo" resultType="java.util.HashMap">
+ select bu.*,sdu.jurisdiction from blade_user bu
+ left join
+ sys_dispatcher sd
+ on
+ bu.id = sd.user_ids
+ left join
+ sys_dispatcher_unit sdu
+ on
+ sdu.id = sd.dispatcher_unit_id
+ where
+ bu.dispatch =0
+ and bu.status = 1
+ and bu.is_deleted = 0
<if test="deptid!=null and deptid!=''">
- and dept_id=#{deptid}
+ and bu.dept_id = #{deptid}
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
- and jurisdiction=#{jurisdiction}
+ and sdu.jurisdiction = #{jurisdiction}
</if>
</select>
+
+ <!--获取工作汇报-->
+ <select id="getWorkReportInfo" 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
+ where
+ 1=1
+ and bu.status = 1
+ and bu.is_deleted = 0
+ <if test="deptid!=null and deptid!=''">
+ and bu.dept_id = #{deptid}
+ </if>
+ <if test="jurisdiction!=null and jurisdiction!=''">
+ and si.jurisdiction = #{jurisdiction}
+ and dept_category=2
+ </if>
+ </select>
+
+
+ <!--获取工作汇报 向民警-->
+ <select id="getWorkReportInfos" resultType="java.util.HashMap">
+ select bu.* from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ where
+ 1=1
+ and bu.status = 1
+ and bu.is_deleted = 0
+ <if test="deptid!=null and deptid!=''">
+ and bu.dept_id = #{deptid}
+ </if>
+ <if test="jurisdiction!=null and jurisdiction!=''">
+ and bu.jurisdiction = #{jurisdiction}
+ and dept_category=2
+ </if>
+ </select>
+
+ <!--查询用的派遣信息-->
+ <select id="getDispatcherInfoByUserId" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
+ select
+ sd.id,sdu.jurisdiction
+ from
+ sys_dispatcher sd
+ left join
+ sys_dispatcher_unit sdu
+ on
+ sdu.id = sd.dispatcher_unit_id
+ where sd.user_ids = #{userId}
+ and sd.status = 0
+ </select>
+
</mapper>
--
Gitblit v1.9.3