From 87f94251ee98c1dcd7a9a79896a8d7958bc5ecb4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 08:44:19 +0800
Subject: [PATCH] 工作汇报接收人员接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 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 7dc9f0c..a41b587 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}
@@ -231,6 +231,14 @@
</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}
@@ -393,10 +401,9 @@
where bu.id = #{user.id}
</select>
+ <!--获取派遣信息-->
<select id="getDispaterInfo" resultType="java.util.HashMap">
select bu.*,sdu.jurisdiction from blade_user bu
- left join
- blade
left join
sys_dispatcher sd
on
@@ -429,14 +436,51 @@
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 sdu.jurisdiction = #{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