From 7fa8bbfd1b1b3b108bf3cc6b5db3356de247a75e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 19 Aug 2021 17:09:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=9A=E8=AE=AF=E5=BD=95=E3=80=91?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E6=A3=80=E7=B4=A2=E5=B7=A5=E4=BD=9C=E4=BA=BA?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epmetuser/form/ListStaffFormDTO.java | 6 +- .../epmetuser/result/ListStaffResultDTO.java | 19 +++-- .../govorg/result/StaffOrgNameResultDTO.java | 45 ++++++++++ .../controller/EpmetUserController.java | 2 +- .../dao/epmetuser/CustomerStaffDao.java | 7 ++ .../dataaggre/dao/epmetuser/StaffRoleDao.java | 6 ++ .../dao/govorg/CustomerAgencyDao.java | 7 ++ .../epmetuser/impl/EpmetUserServiceImpl.java | 18 +++- .../service/govorg/GovOrgService.java | 7 ++ .../govorg/impl/GovOrgServiceImpl.java | 10 +++ .../mapper/epmetuser/CustomerStaffDao.xml | 19 +++++ .../mapper/epmetuser/StaffRoleDao.xml | 12 +++ .../mapper/govorg/CustomerAgencyDao.xml | 85 +++++++++++++++++++ 13 files changed, 231 insertions(+), 12 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/StaffOrgNameResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java index 253a82639e..e7569b16d1 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java @@ -15,10 +15,14 @@ public class ListStaffFormDTO implements Serializable { private static final long serialVersionUID = -3381286960911634231L; /** - * 客户Id + * 待检索姓名 */ @NotBlank(message = "姓名不能为空", groups = ListStaffFormDTO.Staff.class) private String realName; + /** + * token中客户Id + */ + private String customerId; public interface Staff extends CustomerClientShowGroup {} } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java index 7e04034352..8acbb434ab 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java @@ -3,9 +3,10 @@ package com.epmet.dataaggre.dto.epmetuser.result; import lombok.Data; import java.io.Serializable; +import java.util.List; /** - * @Description 对外接口--【通讯录】姓名检索工作人员-接口返参 + * @Description 【通讯录】姓名检索工作人员-接口返参 * @Auth sun */ @Data @@ -15,14 +16,16 @@ public class ListStaffResultDTO implements Serializable { //工作人员用户id private String staffId = ""; //工作人员姓名 - private String staffName = ""; + private String name = ""; + //性别 + private String gender = ""; + //头像 + private String headPhoto = ""; //手机号 private String mobile = ""; - //用户所属组织id - private String agencyId = ""; - //用户所属组织全路径名称 - private String agencyAllName = ""; - //客户Id - private String customerId = ""; + //人员新增所属组织名【组织-组织，组织-部门，组织-网格】 + private String orgName = ""; + //职责名称列表 + private List roles; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/StaffOrgNameResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/StaffOrgNameResultDTO.java new file mode 100644 index 0000000000..703f3be160 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/StaffOrgNameResultDTO.java @@ -0,0 +1,45 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 查询工作人员注册组织信息 + * @author sun + */ +@Data +public class StaffOrgNameResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + //工作人员所属组织Id + private String agencyId = ""; + //人员Id + private String staffId = ""; + //人员注册时所属组织名【组织-组织，组织-部门，组织-网格】 + private String orgName = ""; + //工作人员添加入口Id(agencyId;deptId;gridId) + private String orgId = ""; + //工作人员添加入口类型(组织:agency;部门:dept;网格:gridId) + private String orgname = ""; + +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index b1bd8de18c..8c9593360c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java @@ -211,7 +211,7 @@ public class EpmetUserController { @PostMapping("stafflistbyrealname") public Result> staffListByRealName(@LoginUser TokenDto tokenDto, @RequestBody ListStaffFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ListStaffFormDTO.Staff.class); - //formDTO.setCustomerId(formDTO.getCustomerId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(epmetUserService.listStaff(formDTO)); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java index 3e96cbcc26..9e2833aacb 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java @@ -19,6 +19,7 @@ package com.epmet.dataaggre.dao.epmetuser; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO; +import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -44,4 +45,10 @@ public interface CustomerStaffDao extends BaseDao { * @author sun */ List selectByStaffIds(@Param("staffIds") List staffIds, @Param("realName") String realName); + + /** + * @Description 模糊查询用户、角色信息 + * @author sun + */ + List selectByRealName(@Param("customerId") String customerId, @Param("realName") String realName); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java index e6435c6507..5fd47fd7c9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java @@ -48,4 +48,10 @@ public interface StaffRoleDao extends BaseDao { **/ List selectStaffRoleList(@Param("customerId") String customerId, @Param("staffId") String staffId); + /** + * @Description 查询工作人员拥有的角色名称列表 + * @Author sun + **/ + List selectByStaffId(@Param("staffId") String staffId); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index 8287c13882..7f95839f61 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -20,6 +20,7 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO; import com.epmet.dataaggre.dto.govorg.result.StaffAgencyGridListResultDTO; +import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -59,4 +60,10 @@ public interface CustomerAgencyDao extends BaseDao { * @Description 递归查询当前组织的直属下级组织列表 **/ List selectSubAgencyList(@Param("subAgencyPids") String subAgencyPids); + + /** + * @Description 批量查询工作人员注册组织信息 + * @author sun + */ + List selelctStaffOrg(@Param("staffIdList") List staffIdList); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index b66cd04d1a..b11736aef3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -16,6 +16,7 @@ import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; +import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; @@ -426,15 +427,28 @@ public class EpmetUserServiceImpl implements EpmetUserService { /** * @Param formDTO - * @Description 通讯录】姓名检索工作人员 + * @Description 【通讯录】姓名检索工作人员 * @author sun */ @Override public List listStaff(ListStaffFormDTO formDTO) { + //1.模糊查询用户、角色信息 + List resultList = customerStaffDao.selectByRealName(formDTO.getCustomerId(), formDTO.getRealName()); + if (null == resultList || resultList.size() < NumConstant.ONE) { + return new ArrayList<>(); + } - return null; + //2.查询用户注册组织信息 + List staffIdList = resultList.stream().map(ListStaffResultDTO::getStaffId).collect(Collectors.toList()); + List orgList = govOrgService.getStaffOrgName(staffIdList); + + //3.封装数据并返回 + resultList.forEach(re -> orgList.stream().filter(l -> re.getStaffId().equals(l.getStaffId())).forEach(s -> re.setOrgName(s.getOrgName()))); + + return resultList; } + /** * 根据角色查询人员列表 * diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 3a2c10ea1c..69acad6539 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -103,4 +103,11 @@ public interface GovOrgService { * @Date 2021/8/19 15:12 */ SubOrgResultDTO getSubOrg(SubOrgFormDTO formDTO); + + /** + * @Description 批量查询工作人员注册组织信息 + * @author sun + */ + List getStaffOrgName(List staffIdList); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index e436e72fac..e993673734 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -405,4 +405,14 @@ public class GovOrgServiceImpl implements GovOrgService { return null; } + /** + * @Description 批量查询工作人员注册组织信息 + * @author sun + */ + @Override + public List getStaffOrgName(List staffIdList) { + List resultList = customerAgencyDao.selelctStaffOrg(staffIdList); + return resultList; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml index 0e06223aa7..8736d1e3bf 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml @@ -31,4 +31,23 @@ + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml index fe5ecb1ff5..ca66bc3c5c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml @@ -46,4 +46,16 @@ + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 58856e4c7c..0ed59dbca9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -62,4 +62,89 @@ created_time DESC + + \ No newline at end of file