From 8fdafb62291b99cb91b0381ff57d089f914fd0eb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 20 Aug 2021 15:33:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=9A=E8=AE=AF=E5=BD=95=E3=80=91?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govorg/form/StaffDetailV2FormDTO.java | 42 ++++++++++++------- .../govorg/result/StaffDetailV2ResultDTO.java | 8 +++- .../govorg/result/StaffOrgNameResultDTO.java | 2 +- .../controller/GovOrgController.java | 2 +- .../dao/epmetuser/CustomerStaffDao.java | 6 +++ .../dao/govorg/CustomerStaffAgencyDao.java | 2 +- .../service/epmetuser/EpmetUserService.java | 8 ++++ .../epmetuser/impl/EpmetUserServiceImpl.java | 23 ++++++++++ .../govorg/impl/GovOrgServiceImpl.java | 21 +++++++++- .../mapper/epmetuser/CustomerStaffDao.xml | 10 +++++ .../mapper/govorg/CustomerAgencyDao.xml | 6 +-- 11 files changed, 107 insertions(+), 23 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java index d38739c346..d568099084 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java @@ -4,6 +4,8 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.Date; +import java.util.List; /** * @Description 【通讯录】人员详情v2-接口返参 @@ -12,20 +14,32 @@ import java.io.Serializable; @Data public class StaffDetailV2FormDTO implements Serializable { private static final long serialVersionUID = -1974456701949979946L; - @NotBlank(message = "parentAgencyId不能为空",groups = AddUserInternalGroup.class) - private String parentAgencyId; - private String areaCode; - /** - * 社区级：community， - * 乡（镇、街道）级:street, - * 区县级: district, - * 市级: city - * 省级:province - */ - @NotBlank(message = "level不能为空",groups = AddUserInternalGroup.class) - private String level; - public interface AddUserInternalGroup { - } + //工作人员用户id + private String staffId = ""; + //工作人员姓名 + private String name = ""; + //性别 + private String gender = ""; + //手机号 + private String mobile = ""; + //头像 + private String headPhoto = ""; + //激活状态：inactive未激活，active已激活 + private String activeFlag = ""; + //激活时间 + private Date activeTime; + //未禁用enable,已禁用disabled + private String enableFlag = ""; + //fulltime专职parttime兼职 + private String workType = ""; + //人员新增所属组织名【组织-组织，组织-部门，组织-网格】 + private String orgName = ""; + //人员添加类型的Id + private String orgId = ""; + //人员添加时的类型【agency;dept;grid】 + private String orgType = ""; + //职责名称列表 + private List roles; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/StaffDetailV2ResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/StaffDetailV2ResultDTO.java index fda8f72636..0813592884 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/StaffDetailV2ResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/StaffDetailV2ResultDTO.java @@ -17,8 +17,10 @@ package com.epmet.dataaggre.dto.govorg.result; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -32,8 +34,10 @@ public class StaffDetailV2ResultDTO implements Serializable { private static final long serialVersionUID = 1L; /** - * 树结构对象 + * 工资人员Id */ - private AgencyGridResultDTO agencyGridList; + @NotBlank(message = "人员Id不能为空", groups = StaffDetailV2ResultDTO.Staff.class) + private String staffId; + public interface Staff extends CustomerClientShowGroup {} } \ No newline at end of file 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 index 703f3be160..5ab2977494 100644 --- 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 @@ -40,6 +40,6 @@ public class StaffOrgNameResultDTO implements Serializable { //工作人员添加入口Id(agencyId;deptId;gridId) private String orgId = ""; //工作人员添加入口类型(组织:agency;部门:dept;网格:gridId) - private String orgname = ""; + private String orgType = ""; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 7895a8d5e7..3f3020c147 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -146,7 +146,7 @@ public class GovOrgController { */ @PostMapping("staffdetailv2") public Result staffDetailV2(@RequestBody StaffDetailV2ResultDTO formDTO) { - //ValidatorUtils.validateEntity(formDTO, StaffDetailV2ResultDTO.listGridMemberDatas.class); + ValidatorUtils.validateEntity(formDTO, StaffDetailV2ResultDTO.Staff.class); return new Result().ok(govOrgService.staffDetailV2(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 f277da4ee1..e06011fe40 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 @@ -58,4 +58,10 @@ public interface CustomerStaffDao extends BaseDao { * @author sun */ List selectStaffList(OrgStaffListFormDTO formDTO); + + /** + * @Description 查询工作人员基础信息 + * @author sun + */ + CustomerStaffDTO 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/CustomerStaffAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java index bcae3db264..941f080bf2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java @@ -59,6 +59,6 @@ public interface CustomerStaffAgencyDao extends BaseDao selectStaffList(String orgId, String orgType); + List selectStaffList(@Param("orgId") String orgId, @Param("orgType") String orgType); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 91cc70fefd..28820e015b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -1,8 +1,10 @@ package com.epmet.dataaggre.service.epmetuser; +import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO; import com.epmet.dataaggre.dto.epmetuser.form.*; import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; +import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; import java.util.List; @@ -132,4 +134,10 @@ public interface EpmetUserService { * @author sun */ List getStaffInfoList(OrgStaffListFormDTO formDTO); + + /** + * @Description 查询工作人员基础信息、角色信息 + * @author sun + */ + StaffDetailV2FormDTO selectByStaffId(String staffId); } 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 df7cb62151..0aa32a6a8d 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 @@ -18,6 +18,7 @@ import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerDepartmentDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; +import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; @@ -577,5 +578,27 @@ public class EpmetUserServiceImpl implements EpmetUserService { return resultList; } + /** + * @Description 查询工作人员基础信息、角色信息 + * @author sun + */ + @Override + public StaffDetailV2FormDTO selectByStaffId(String staffId) { + StaffDetailV2FormDTO result = new StaffDetailV2FormDTO(); + //基本信息 + CustomerStaffDTO dto = customerStaffDao.selectByStaffId(staffId); + if (null == dto) { + return result; + } + //角色信息 + List list = staffRoleDao.selectByStaffId(staffId); + //汇总数据 + result = ConvertUtils.sourceToTarget(dto, StaffDetailV2FormDTO.class); + result.setName(dto.getRealName()); + result.setRoles(list); + + return result; + } + } 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 381ce0a5c6..88afb38539 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 @@ -407,7 +407,26 @@ public class GovOrgServiceImpl implements GovOrgService { */ @Override public StaffDetailV2FormDTO staffDetailV2(StaffDetailV2ResultDTO formDTO) { - return null; + //1.查询工作人员基本信息、角色信息 + StaffDetailV2FormDTO result = epmetUserService.selectByStaffId(formDTO.getStaffId()); + if (null == result) { + return new StaffDetailV2FormDTO(); + } + + //2.查询工作人员注册组织关系信息 + List staffIdList = new ArrayList<>(); + staffIdList.add(formDTO.getStaffId()); + List list = customerAgencyDao.selelctStaffOrg(staffIdList); + if (null == list || list.size() < NumConstant.ONE) { + throw new RenException("未查询到工作人员注册组织信息"); + } + + //3.封装数据并返回 + result.setOrgId(list.get(0).getOrgId()); + result.setOrgName(list.get(0).getOrgName()); + result.setOrgType(list.get(0).getOrgType()); + + return result; } /** 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 2783476730..6fea2678fe 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 @@ -110,4 +110,14 @@ ) + + \ 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 eda0707461..b96b990b81 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 @@ -76,7 +76,7 @@ ) )orgName, sor.org_id orgId, - 'agency' orgname + 'agency' orgType FROM staff_org_relation sor INNER JOIN customer_agency ca ON sor.org_id = ca.id @@ -103,7 +103,7 @@ ) )orgName, sor.org_id orgId, - 'dept' orgname + 'dept' orgType FROM staff_org_relation sor INNER JOIN customer_department cd ON sor.org_id = cd.id @@ -131,7 +131,7 @@ ) )orgName, sor.org_id orgId, - 'grid' orgname + 'grid' orgType FROM staff_org_relation sor INNER JOIN customer_grid cg ON sor.org_id = cg.id