添加 组织-工作人员相关接口

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffsInAgencyFromDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/23 15:45
+ */
+@Data
+public class StaffsInAgencyFromDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 机关ID
+	 */
+	private String agencyId;
+	/**
+	 * 用户ID
+	 */
+	private List<String> staffList;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInfoResultDTO.java

@@ -0,0 +1,38 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/23 16:08
+ */
+@Data
+public class StaffInfoResultDTO implements Serializable {
+	/**
+	 * 用户ID
+	 */
+	private String staffId;
+	/**
+	 * 用户姓名
+	 */
+	private String staffName;
+	/**
+	 * 头像
+	 */
+	private String staffHeadPhoto;
+	/**
+	 * 性别
+	 */
+	private Integer gender;
+	/**
+	 * 是否禁用（未禁用enable,已禁用disabled）
+	 */
+	private String enableFlag;
+	/**
+	 * 权限名
+	 */
+	private String roleName;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffsInAgencyResultDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/23 15:58
+ */
+@NoArgsConstructor
+@Data
+public class StaffsInAgencyResultDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 人员总数
+	 */
+	private Integer staffCount;
+	/**
+	 * 人员列表
+	 */
+	private List<StaffInfoResultDTO> staffList;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffAgencyController.java

@@ -26,7 +26,9 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.CustomerStaffAgencyDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.excel.CustomerStaffAgencyExcel;
 import com.epmet.service.CustomerStaffAgencyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -104,4 +106,7 @@ public class CustomerStaffAgencyController {
         return customerStaffAgencyService.getLatestCustomer(userId);
     }
 
+
+
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -0,0 +1,36 @@
+package com.epmet.controller;
+
+
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
+import com.epmet.dto.result.StaffsInAgencyResultDTO;
+import com.epmet.service.StaffService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 组织结构-工作人员
+ * @author zhaoqifeng
+ * @date 2020/4/23 17:59
+ */
+@RestController
+@RequestMapping("staff")
+public class StaffController {
+	@Autowired
+	private StaffService staffService;
+	/**
+	 * 组织首页-工作人员列表
+	 * @param fromDTO
+	 * @return
+	 */
+	@PostMapping("staffsinagency")
+	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
+		return staffService.getStaffInfoForHome(fromDTO);
+	}
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java

@@ -22,6 +22,8 @@ import com.epmet.dto.CustomerStaffAgencyDTO;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 人员-机关单位关系表
  *
@@ -38,4 +40,11 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
 	 */
 	CustomerStaffAgencyDTO selectLatestCustomerByStaff(String userId);
 
+	/**
+	 * 获取机关下的工作人员
+	 * @param agencyId
+	 * @return
+	 */
+	List<CustomerStaffAgencyDTO> selectCustomerStaffAgencyList(String agencyId);
+	
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -5,6 +5,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,4 +35,12 @@ public interface EpmetUserFeignClient {
     @PostMapping("/epmetuser/customerstaff/selectstaffgridlistbyuserid")
     Result<List<StaffGridListDTO>> getStaffGridList(@RequestBody List<CustomerStaffGridDTO> customerStaffGridDTOS);
 
+	/**
+	 * 组织首页-工作人员列表
+	 * @param fromDTO
+	 * @return
+	 */
+	@PostMapping("/epmetuser/customerstaff/staffsinagency")
+	Result<List<StaffInfoResultDTO>> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -6,6 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -25,4 +27,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result<List<StaffGridListDTO>> getStaffGridList(List<CustomerStaffGridDTO> customerStaffGridDTOS) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffGridList", customerStaffGridDTOS);
     }
+
+    @Override
+    public Result<List<StaffInfoResultDTO>> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffInfoForHome", fromDTO);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffAgencyService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffAgencyDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 
@@ -102,4 +103,13 @@ public interface CustomerStaffAgencyService extends BaseService<CustomerStaffAge
 	 * @return
 	 */
 	Result<LatestCustomerResultDTO> getLatestCustomer(String userId);
+
+	/**
+	 * 获取组织下关联人员
+	 * @param fromDTO
+	 * @return
+	 */
+	Result<List<CustomerStaffAgencyDTO>> getCustomerStaffAgencyList(StaffsInAgencyFromDTO fromDTO);
+
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java

@@ -0,0 +1,22 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffsInAgencyResultDTO;
+
+/**
+ * 组织结构-工作人员
+ *
+ * @author zhaoqifeng
+ * @date 2020/4/23 18:00
+ */
+public interface StaffService {
+	/**
+	 * 组织首页-工作人员列表
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffsInAgencyResultDTO>
+	 * @author zhaoqifeng
+	 */
+	Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO);
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java

@@ -28,11 +28,16 @@ import com.epmet.dao.CustomerStaffAgencyDao;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.CustomerStaffAgencyDTO;
 import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
+import com.epmet.dto.result.StaffsInAgencyResultDTO;
+import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.CustomerStaffAgencyRedis;
+import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerStaffAgencyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 人员-机关单位关系表
@@ -58,6 +64,8 @@ public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl<CustomerStaf
     private EpmetUserFeignClient epmetUserFeignClient;
     @Autowired
     private OperCrmFeignClient operCrmFeignClient;
+    @Autowired
+    private CustomerAgencyService customerAgencyService;
 
     @Override
     public PageData<CustomerStaffAgencyDTO> page(Map<String, Object> params) {
@@ -121,8 +129,7 @@ public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl<CustomerStaf
         //获取工作人员头像
         CustomerStaffDTO customerStaffParam = new CustomerStaffDTO();
         customerStaffParam.setUserId(userId);
-        Result<CustomerStaffDTO> staffInfo =
+        Result<CustomerStaffDTO> staffInfo = epmetUserFeignClient.getCustomerStaffInfoByUserId(customerStaffParam);
-                epmetUserFeignClient.getCustomerStaffInfoByUserId(customerStaffParam);
         resultDTO.setStaffHeadPhoto(staffInfo.getData().getHeadPhoto());
         resultDTO.setGender(staffInfo.getData().getGender());
         //获取客户名称
@@ -133,4 +140,12 @@ public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl<CustomerStaf
         return new Result<LatestCustomerResultDTO>().ok(resultDTO);
     }
 
+    @Override
+    public Result<List<CustomerStaffAgencyDTO>> getCustomerStaffAgencyList(StaffsInAgencyFromDTO fromDTO) {
+
+        List<CustomerStaffAgencyDTO> customerStaffAgencyList = baseDao.selectCustomerStaffAgencyList(fromDTO.getAgencyId());
+
+        return new Result<List<CustomerStaffAgencyDTO>>().ok(customerStaffAgencyList);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -0,0 +1,54 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerStaffAgencyDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
+import com.epmet.dto.result.StaffsInAgencyResultDTO;
+import com.epmet.entity.CustomerAgencyEntity;
+import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.OperCrmFeignClient;
+import com.epmet.service.CustomerAgencyService;
+import com.epmet.service.CustomerStaffAgencyService;
+import com.epmet.service.StaffService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/23 18:05
+ */
+@Service
+public class StaffServiceImpl implements StaffService {
+	@Autowired
+	private EpmetUserFeignClient epmetUserFeignClient;
+	@Autowired
+	private OperCrmFeignClient operCrmFeignClient;
+	@Autowired
+	private CustomerAgencyService customerAgencyService;
+	@Autowired
+	private CustomerStaffAgencyService customerStaffAgencyService;
+	@Override
+	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
+		StaffsInAgencyResultDTO resultDTO = new StaffsInAgencyResultDTO();
+		//获取机关所在客户ID和人员总数
+		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
+		resultDTO.setStaffCount(customerAgencyEntity.getTotalUser());
+		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
+		List<CustomerStaffAgencyDTO> customerStaffAgencyList = customerStaffAgencyService.getCustomerStaffAgencyList(fromDTO).getData();
+		if (null == customerStaffAgencyList || customerStaffAgencyList.size() == 0) {
+			return new Result<StaffsInAgencyResultDTO>().ok(null);
+		}
+		//提取所有userID
+		List<String> staffIds = customerStaffAgencyList.stream().map(CustomerStaffAgencyDTO::getUserId).collect(Collectors.toList());
+		fromDTO.setStaffList(staffIds);
+		//获取用户信息
+		Result<List<StaffInfoResultDTO>> staffInfoListResult =  epmetUserFeignClient.getStaffInfoForHome(fromDTO);
+		resultDTO.setStaffList(staffInfoListResult.getData());
+		return new Result<StaffsInAgencyResultDTO>().ok(resultDTO);
+	}
+}

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml

@@ -28,5 +28,15 @@
             CREATED_TIME DESC
         LIMIT 1
     </select>
+    <select id="selectCustomerStaffAgencyList" parameterType="java.lang.String"
+            resultType="com.epmet.dto.CustomerStaffAgencyDTO">
+        SELECT
+            *
+        FROM
+            customer_staff_agency
+        WHERE
+            DEL_FLAG = '0'
+          AND AGENCY_ID =#{agencyId}
+    </select>
 
 </mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java

@@ -128,4 +128,9 @@ public class CustomerStaffDTO implements Serializable {
      * 客户id
      */
 	private String customerId;
+
+	/**
+	 * 角色名称
+	 */
+	private String roleName;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -30,6 +30,8 @@ import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.excel.CustomerStaffExcel;
 import com.epmet.service.CustomerStaffService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -143,4 +145,14 @@ public class CustomerStaffController {
     public Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) {
         return customerStaffService.getCustomerStaffInfoByUserId(formDTO);
     }
+
+    /**
+     * 组织首页-工作人员列表
+     * @param fromDTO
+     * @return
+     */
+    @PostMapping("staffsinagency")
+    public Result<List<StaffInfoResultDTO>> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
+        return customerStaffService.getStaffInfoForHome(fromDTO);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java

@@ -22,6 +22,8 @@ import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -56,6 +58,21 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 
 	CustomerStaffDTO selectStaffInfoByUserId(CustomerStaffDTO formDTO);
 
+	/**
+	 * 根据userId查询查询网格下的用户信息
+	 *
+	 * @param customerStaffGridDTOS
+	 * @return
+	 */
+	List<StaffGridListDTO> selectStaffGridListByUserId(List<CustomerStaffGridDTO> customerStaffGridDTOS);
+
+	/**
+	 * 根据用户ID列表获取用户信息
+	 *
+	 * @param fromDTO
+	 * @return
+	 */
+	List<StaffInfoResultDTO> selectCustomerStaffList(StaffsInAgencyFromDTO fromDTO);
     /**
      * 根据userId查询查询网格下的用户信息
      * @param customerStaffGridDTOS

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -23,8 +23,9 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
 
 import java.util.List;
@@ -132,4 +133,11 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @return
 	 */
 	Result<List<StaffGridListDTO>> selectStaffGridListByUserId(List<CustomerStaffGridDTO> customerStaffGridDTOS);
+
+	/**
+	 * 组织首页-工作人员列表
+	 * @param fromDTO
+	 * @return
+	 */
+	Result<List<StaffInfoResultDTO>> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -30,8 +30,9 @@ import com.epmet.dao.CustomerStaffDao;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
 import com.epmet.redis.CustomerStaffRedis;
 import com.epmet.service.CustomerStaffService;
@@ -149,4 +150,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         return new Result<List<StaffGridListDTO>>().ok(staffGridListDTOS);
     }
 
+    @Override
+    public Result<List<StaffInfoResultDTO>> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
+        List<StaffInfoResultDTO> list = baseDao.selectCustomerStaffList(fromDTO);
+        return new Result<List<StaffInfoResultDTO>>().ok(list);
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -41,6 +41,33 @@
             </foreach>
             AND cs.del_flag = 0
     </select>
+    <select id="selectCustomerStaffList" resultType="com.epmet.dto.result.StaffInfoResultDTO" parameterType="com.epmet.dto.form.StaffsInAgencyFromDTO">
+        SELECT
+            cs.USER_ID AS "staffId",
+            cs.REAL_NAME AS "staffName",
+            cs.GENDER AS "gender",
+            cs.HEAD_PHOTO AS "staffHeadPhoto",
+            cs.ENABLE_FLAG AS "enableFlag",
+            gsr.ROLE_NAME AS "roleName"
+        FROM
+            customer_staff cs
+        LEFT JOIN staff_role sr ON cs.USER_ID = sr.STAFF_ID
+        AND sr.DEL_FLAG = '0'
+        AND sr.ORG_ID = #{agencyId}
+        LEFT JOIN gov_staff_role gsr ON sr.ROLE_ID = gsr.ID
+        AND gsr.DEL_FLAG = '0'
+        AND gsr.CUSTOMER_ID = #{customerId}
+        AND gsr.ROLE_KEY = 'agency_leader'
+        WHERE
+            cs.DEL_FLAG = '0'
+        AND
+            cs.USER_ID in
+        <foreach item="userId" collection="staffList" separator="," open="(" close=")" index="">
+            #{userId}
+        </foreach>
+        ORDER BY gsr.ROLE_NAME DESC, cs.CREATED_TIME DESC
+        LIMIT 12
+    </select>
 
     <!--  根据staffid查询用户基本信息  -->
     <select id="selectByUserId" parameterType="java.lang.String" resultType="com.epmet.entity.CustomerStaffEntity">