Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info

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<String> roles;
 
 }

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 {}
 
 }

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 = "";
 
 }

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<StaffDetailV2FormDTO> staffDetailV2(@RequestBody StaffDetailV2ResultDTO formDTO) {
-        //ValidatorUtils.validateEntity(formDTO, StaffDetailV2ResultDTO.listGridMemberDatas.class);
+        ValidatorUtils.validateEntity(formDTO, StaffDetailV2ResultDTO.Staff.class);
         return new Result<StaffDetailV2FormDTO>().ok(govOrgService.staffDetailV2(formDTO));
     }
 

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<CustomerStaffEntity> {
      * @author sun
      */
     List<ListStaffResultDTO> selectStaffList(OrgStaffListFormDTO formDTO);
+
+    /**
+     * @Description 查询工作人员基础信息
+     * @author sun
+     */
+    CustomerStaffDTO selectByStaffId(@Param("staffId") String staffId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java

@@ -60,7 +60,7 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
      * @Description 按类型查询组织、部门、网格下所有工作人员Id列表
      * @author sun
      */
-    List<String> selectStaffList(String orgId, String orgType);
+    List<String> selectStaffList(@Param("orgId") String orgId, @Param("orgType") String orgType);
 
     /**
      * @Description 获取下级组织列表

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<ListStaffResultDTO> getStaffInfoList(OrgStaffListFormDTO formDTO);
+
+    /**
+     * @Description 查询工作人员基础信息、角色信息
+     * @author sun
+     */
+    StaffDetailV2FormDTO selectByStaffId(String staffId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -22,6 +22,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.dto.govorg.result.StaffOrgRelationResultDTO;
@@ -614,5 +615,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<String> list = staffRoleDao.selectByStaffId(staffId);
+        //汇总数据
+        result = ConvertUtils.sourceToTarget(dto, StaffDetailV2FormDTO.class);
+        result.setName(dto.getRealName());
+        result.setRoles(list);
+
+        return result;
+    }
+
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -410,7 +410,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<String> staffIdList = new ArrayList<>();
+        staffIdList.add(formDTO.getStaffId());
+        List<StaffOrgNameResultDTO> 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;
     }
 
     /**

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml

@@ -110,4 +110,14 @@
         )
     </select>
 
+    <select id="selectByStaffId" resultType="com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO">
+         SELECT
+            *
+        FROM
+            customer_staff
+        WHERE
+            del_flag = '0'
+        AND USER_ID = #{staffId}
+    </select>
+
 </mapper>

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