From 341d34aab4bbe6fc2ed0920c335b1f5784f2db9c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 19:25:05 +0800
Subject: [PATCH] 接收人员查询，派遣列表app端接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 56 ++++++++++++++++++++-------
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 1
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 11 +++++
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 21 ++++++++++
4 files changed, 72 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 0e26e87..9e46a1d 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -224,6 +224,7 @@
bd.id = bu.dept_id
where 1=1
and bu.is_deleted = 0
+ and bu.status = 1
<if test="type==1">
and dept_category=1
</if>
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 08a7520..2674d2d 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -131,7 +131,26 @@
UserVO getUserAgeById(@Param("userId") Long userId);
List<Map<String, Object>> selectUser();
- List<Map<String, Object>> seleL(String type,String deptid,String jurisdiction);
+
+
+ /**
+ * 派遣人员
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ List<Map<String, Object>> getDispaterInfo(@Param("deptid")String deptid,
+ @Param("jurisdiction")String jurisdiction);
+
+ /**
+ * 工作汇报人员
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ List<Map<String, Object>> getWorkReportInfo(@Param("type")String type,
+ @Param("deptid")String deptid,
+ @Param("jurisdiction")String jurisdiction);
/**
* 根据保安员编码查询保安信息
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 7a47591..7dc9f0c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -393,24 +393,50 @@
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
- </if>
+ <select id="getDispaterInfo" resultType="java.util.HashMap">
+ select bu.*,sdu.jurisdiction from blade_user bu
+ left join
+ blade
+ 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
+ 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 dept_category=2
</if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 9f8e67a..7f854b8 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -623,6 +623,15 @@
@Override
public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction) {
- return baseMapper.seleL(type,deptid, jurisdiction);
+ List<Map<String, Object>> list = new ArrayList<>();
+ //工作汇报
+ if (type.equals(1)){
+ list = baseMapper.getDispaterInfo(deptid, jurisdiction);
+ }
+ //派遣
+ if (type.equals(2) ||type.equals(3)){
+ list = baseMapper.getWorkReportInfo(type,deptid, jurisdiction);
+ }
+ return list;
}
}
--
Gitblit v1.9.3