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

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

@@ -0,0 +1,31 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/24 10:12
+ */
+
+@Data
+public class StaffInfoFromDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 机关ID
+	 */
+	@NotBlank(message = "机关ID不能为空")
+	private String agencyId;
+	/**
+	 * 用户ID
+	 */
+	String staffId;
+}

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

@@ -0,0 +1,53 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/24 10:43
+ */
+@NoArgsConstructor
+@Data
+public class StaffSubmitFromDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 机关ID
+	 */
+	@NotBlank(message = "机关ID不能为空")
+	private String agencyId;
+	/**
+	 * 人员ID
+	 */
+	private String staffId;
+	/**
+	 * 姓名
+	 */
+	@NotBlank(message = "姓名不能为空")
+	private String name;
+	/**
+	 * 手机
+	 */
+	@NotBlank(message = "手机号不能为空")
+	private String mobile;
+	/**
+	 * 性别
+	 */
+	@NotBlank(message = "性别不能为空")
+	private Integer gender;
+	/**
+	 * 专兼职
+	 */
+	@NotBlank(message = "专兼职不能为空")
+	private String workType;
+	/**
+	 * 角色id列表
+	 */
+	@NotBlank(message = "角色不能为空")
+	private List<String> roles;
+}

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

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
@@ -20,6 +21,7 @@ public class StaffsInAgencyFromDTO implements Serializable {
 	/**
 	 * 机关ID
 	 */
+	@NotBlank(message = "机关ID不能为空")
 	private String agencyId;
 	/**
 	 * 用户ID

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

@@ -0,0 +1,54 @@
+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/24 10:50
+ */
+@NoArgsConstructor
+@Data
+public class StaffDetailResultDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 人员ID
+	 */
+	private String staffId;
+	/**
+	 * 姓名
+	 */
+	private String name;
+	/**
+	 * 手机号
+	 */
+	private String mobile;
+	/**
+	 * 头像
+	 */
+	private String headPhoto;
+	/**
+	 * 激活状态：inactive未激活，active已激活
+	 */
+	private String activeFlag;
+	/**
+	 * 激活时间
+	 */
+	private String activeTime;
+	/**
+	 * 性别
+	 */
+	private Integer gender;
+	/**
+	 * 是否禁用(未禁用enable,已禁用disabled)
+	 */
+	private String enableFlag;
+	/**
+	 * 职责名称列表
+	 */
+	private List<String> roles;
+}

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

@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/24 10:14
+ */
+@Data
+public class StaffInitResultDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 人员ID
+	 */
+	private String staffId;
+	/**
+	 * 姓名
+	 */
+	private String name;
+	/**
+	 * 手机号
+	 */
+	private String mobile;
+	/**
+	 * 性别
+	 */
+	private Integer gender;
+	/**
+	 * 专兼职
+	 */
+	private String workType;
+	/**
+	 * 职责列表
+	 */
+	private List<StaffRoleResultDTO> roleList;
+}

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

@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/24 10:18
+ */
+@Data
+public class StaffRoleResultDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 角色ID
+	 */
+	private String roleId;
+	/**
+	 * 角色名称
+	 */
+	private String roleName;
+	/**
+	 * 是否选中(选中的是true)
+	 */
+	private Boolean selected;
+}

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

@@ -3,8 +3,12 @@ package com.epmet.controller;
 
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffInfoFromDTO;
+import com.epmet.dto.form.StaffSubmitFromDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffDetailResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
+import com.epmet.dto.result.StaffInitResultDTO;
 import com.epmet.dto.result.StaffsInAgencyResultDTO;
 import com.epmet.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,4 +37,83 @@ public class StaffController {
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
 		return staffService.getStaffInfoForHome(fromDTO);
 	}
+
+	/**
+	 * 查看人员列表
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffsInAgencyResultDTO>
+	 * @author zhaoqifeng
+	 */
+	@PostMapping("stafflist")
+	public Result<List<StaffInfoResultDTO>> getStaffList(StaffsInAgencyFromDTO fromDTO){
+		return staffService.getStaffList(fromDTO);
+	}
+
+
+	/**
+	 * 人员添加页面初始化
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffInitResultDTO>
+	 */
+	@PostMapping("rolelist")
+	public Result<StaffInitResultDTO> addStaffInit(StaffInfoFromDTO fromDTO){
+		return staffService.addStaffInit(fromDTO);
+	}
+
+	/**
+	 * 人员编辑页面初始化
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffInitResultDTO>
+	 */
+	@PostMapping("editstaffinit")
+	public Result<StaffInitResultDTO> editStaffInit(StaffInfoFromDTO fromDTO){
+		return staffService.editStaffInit(fromDTO);
+	}
+
+	/**
+	 * 人员添加
+	 *
+	 * @param fromDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("addstaff")
+	public Result addStaff(StaffSubmitFromDTO fromDTO){
+		return staffService.addStaff(fromDTO);
+	}
+
+	/**
+	 * 人员编辑
+	 *
+	 * @param fromDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("editstaff")
+	public Result editStaff(StaffSubmitFromDTO fromDTO){
+		return staffService.editStaff(fromDTO);
+	}
+
+	/**
+	 * 人员详情
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffDetailResultDTO>
+	 */
+	@PostMapping("staffdetail")
+	public Result<StaffDetailResultDTO> getStaffDetail(StaffInfoFromDTO fromDTO){
+		return staffService.getStaffDetail(fromDTO);
+	}
+
+	/**
+	 * 人员禁用
+	 *
+	 * @param fromDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("disabledstaff")
+	public Result disabledStaff(StaffInfoFromDTO fromDTO){
+		return staffService.disabledStaff(fromDTO);
+	}
 }

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

@@ -1,9 +1,16 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffInfoFromDTO;
+import com.epmet.dto.form.StaffSubmitFromDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffDetailResultDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
+import com.epmet.dto.result.StaffInitResultDTO;
 import com.epmet.dto.result.StaffsInAgencyResultDTO;
 
+import java.util.List;
+
 /**
  * 组织结构-工作人员
  *
@@ -19,4 +26,62 @@ public interface StaffService {
 	 * @author zhaoqifeng
 	 */
 	Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO);
+
+	/**
+	 * 查看人员列表
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffsInAgencyResultDTO>
+	 * @author zhaoqifeng
+	 */
+	Result<List<StaffInfoResultDTO>> getStaffList(StaffsInAgencyFromDTO fromDTO);
+
+	/**
+	 * 人员添加页面初始化
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffInitResultDTO>
+	 */
+	Result<StaffInitResultDTO> addStaffInit(StaffInfoFromDTO fromDTO);
+
+	/**
+	 * 人员编辑页面初始化
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffInitResultDTO>
+	 */
+	Result<StaffInitResultDTO> editStaffInit(StaffInfoFromDTO fromDTO);
+
+	/**
+	 * 人员添加
+	 *
+	 * @param fromDTO 参数
+	 * @return Result
+	 */
+	Result addStaff(StaffSubmitFromDTO fromDTO);
+
+	/**
+	 * 人员编辑
+	 *
+	 * @param fromDTO 参数
+	 * @return Result
+	 */
+	Result editStaff(StaffSubmitFromDTO fromDTO);
+
+	/**
+	 * 人员详情
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffDetailResultDTO>
+	 */
+	Result<StaffDetailResultDTO> getStaffDetail(StaffInfoFromDTO fromDTO);
+
+	/**
+	 * 人员禁用
+	 *
+	 * @param fromDTO 参数
+	 * @return Result
+	 */
+	Result disabledStaff(StaffInfoFromDTO fromDTO);
+
 }

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

@@ -2,8 +2,12 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffAgencyDTO;
+import com.epmet.dto.form.StaffInfoFromDTO;
+import com.epmet.dto.form.StaffSubmitFromDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffDetailResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
+import com.epmet.dto.result.StaffInitResultDTO;
 import com.epmet.dto.result.StaffsInAgencyResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.feign.EpmetUserFeignClient;
@@ -51,4 +55,51 @@ public class StaffServiceImpl implements StaffService {
 		resultDTO.setStaffList(staffInfoListResult.getData());
 		return new Result<StaffsInAgencyResultDTO>().ok(resultDTO);
 	}
+
+	@Override
+	public Result<List<StaffInfoResultDTO>> getStaffList(StaffsInAgencyFromDTO fromDTO) {
+		//获取机关所在客户ID
+		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
+		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
+		List<CustomerStaffAgencyDTO> customerStaffAgencyList = customerStaffAgencyService.getCustomerStaffAgencyList(fromDTO).getData();
+		if (null == customerStaffAgencyList || customerStaffAgencyList.size() == 0) {
+			return new Result<List<StaffInfoResultDTO>>().ok(null);
+		}
+		//提取所有userID
+		List<String> staffIds = customerStaffAgencyList.stream().map(CustomerStaffAgencyDTO::getUserId).collect(Collectors.toList());
+		fromDTO.setStaffList(staffIds);
+		//获取用户列表
+		Result<List<StaffInfoResultDTO>> staffInfoListResult =  epmetUserFeignClient.getStaffInfoForHome(fromDTO);
+		return null;
+	}
+
+	@Override
+	public Result<StaffInitResultDTO> addStaffInit(StaffInfoFromDTO fromDTO) {
+		return null;
+	}
+
+	@Override
+	public Result<StaffInitResultDTO> editStaffInit(StaffInfoFromDTO fromDTO) {
+		return null;
+	}
+
+	@Override
+	public Result addStaff(StaffSubmitFromDTO fromDTO) {
+		return null;
+	}
+
+	@Override
+	public Result editStaff(StaffSubmitFromDTO fromDTO) {
+		return null;
+	}
+
+	@Override
+	public Result<StaffDetailResultDTO> getStaffDetail(StaffInfoFromDTO fromDTO) {
+		return null;
+	}
+
+	@Override
+	public Result disabledStaff(StaffInfoFromDTO fromDTO) {
+		return null;
+	}
 }

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

@@ -154,6 +154,16 @@ public class CustomerStaffController {
         return customerStaffService.getStaffInfoForHome(fromDTO);
     }
 
+    /**
+     * 工作人员列表
+     * @param fromDTO
+     * @return
+     */
+    @PostMapping("stafflist")
+    public Result<List<StaffInfoResultDTO>> getStaffList(StaffsInAgencyFromDTO fromDTO) {
+        return customerStaffService.getStaffList(fromDTO);
+    }
+
     @PostMapping(value = "selectgridstaffcountbyuserid")
     public Result<GridStaffCountDTO> selectGridStaffCountByUserId(@RequestBody UserIdDTO userIdDTO){
         return customerStaffService.selectGridStaffCountByUserId(userIdDTO);

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

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
 import com.epmet.dto.form.CustomerStaffFormDTO;
+import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
@@ -88,4 +89,21 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @Date 2020/4/23 16:46
      **/
     CustomerStaffEntity selectByUserId(String userId);
+
+	/**
+	 * 工作人员列表
+	 *
+	 * @param fromDTO
+	 * @return
+	 */
+	List<StaffInfoResultDTO> selectStaffList(StaffsInAgencyFromDTO fromDTO);
+
+	/**
+	 * 获取工作人员详情
+	 * @param fromDTO
+	 * @return
+	 */
+	CustomerStaffDTO selectStaffInfo(StaffInfoFromDTO fromDTO);
+
+
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.entity.GovStaffRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -41,4 +42,10 @@ public interface GovStaffRoleDao extends BaseDao<GovStaffRoleEntity> {
      */
     List<GovStaffRoleEntity> listRolesByStaffId(@Param("staffId") String staffId, @Param("orgId") String orgId);
 
+    /**
+     * 获取客户机关角色列表
+     * @param params
+     * @return
+     */
+    List<GovStaffRoleDTO> selectGovStaffRoleList(GovStaffRoleDTO params);
 }

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

@@ -26,8 +26,12 @@ 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.StaffInfoFromDTO;
+import com.epmet.dto.form.StaffSubmitFromDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffDetailResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
+import com.epmet.dto.result.StaffInitResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
 
 import java.util.List;
@@ -143,6 +147,61 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 */
 	Result<List<StaffInfoResultDTO>> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO);
 
+	/**
+	 * 工作人员列表
+	 * @param fromDTO
+	 * @return
+	 */
+	Result<List<StaffInfoResultDTO>> getStaffList(StaffsInAgencyFromDTO fromDTO);
+
+	/**
+	 * 人员添加页面初始化
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffInitResultDTO>
+	 */
+	Result<StaffInitResultDTO> addStaffInit(StaffInfoFromDTO fromDTO);
+
+	/**
+	 * 人员编辑页面初始化
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffInitResultDTO>
+	 */
+	Result<StaffInitResultDTO> editStaffInit(StaffInfoFromDTO fromDTO);
+
+	/**
+	 * 人员添加
+	 *
+	 * @param fromDTO 参数
+	 * @return Result
+	 */
+	Result addStaff(StaffSubmitFromDTO fromDTO);
+
+	/**
+	 * 人员编辑
+	 *
+	 * @param fromDTO 参数
+	 * @return Result
+	 */
+	Result editStaff(StaffSubmitFromDTO fromDTO);
+
+	/**
+	 * 人员详情
+	 *
+	 * @param fromDTO 参数
+	 * @return Result<StaffDetailResultDTO>
+	 */
+	Result<StaffDetailResultDTO> getStaffDetail(StaffInfoFromDTO fromDTO);
+
+	/**
+	 * 人员禁用
+	 *
+	 * @param fromDTO 参数
+	 * @return Result
+	 */
+	Result disabledStaff(StaffInfoFromDTO fromDTO);
+
 	/**
 	 * 根据userId查询网格下未被禁用的人员数量
 	 * @param userIdDTO

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

@@ -99,4 +99,11 @@ public interface GovStaffRoleService extends BaseService<GovStaffRoleEntity> {
      * @return
      */
     List<GovStaffRoleEntity> listRolesByStaffId(String staffId, String orgId);
+
+    /**
+     * 获取当前机关下的角色列表
+     * @param dto
+     * @return
+     */
+    List<GovStaffRoleDTO> getGovStaffRoleList(GovStaffRoleDTO dto);
 }

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

@@ -31,13 +31,22 @@ import com.epmet.dto.*;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.StaffGridListDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
+import com.epmet.dto.form.StaffInfoFromDTO;
+import com.epmet.dto.form.StaffSubmitFromDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.result.StaffDetailResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
+import com.epmet.dto.result.StaffInitResultDTO;
+import com.epmet.dto.result.StaffRoleResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
+import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.redis.CustomerStaffRedis;
 import com.epmet.service.CustomerStaffService;
+import com.epmet.service.GovStaffRoleService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -48,6 +57,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 政府工作人员表
@@ -55,108 +65,193 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-18
  */
+@Slf4j
 @Service
 public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao, CustomerStaffEntity> implements CustomerStaffService {
-    private Logger logger = LogManager.getLogger(getClass());
-    @Autowired
-    private CustomerStaffRedis customerStaffRedis;
+	private Logger logger = LogManager.getLogger(getClass());
+	@Autowired
+	private CustomerStaffRedis customerStaffRedis;
+	@Autowired
+	private GovStaffRoleService govStaffRoleService;
 
-    @Override
-    public PageData<CustomerStaffDTO> page(Map<String, Object> params) {
-        IPage<CustomerStaffEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, CustomerStaffDTO.class);
-    }
+	@Override
+	public PageData<CustomerStaffDTO> page(Map<String, Object> params) {
+		IPage<CustomerStaffEntity> page = baseDao.selectPage(
+				getPage(params, FieldConstant.CREATED_TIME, false),
+				getWrapper(params)
+		);
+		return getPageData(page, CustomerStaffDTO.class);
+	}
 
-    @Override
-    public List<CustomerStaffDTO> list(Map<String, Object> params) {
-        List<CustomerStaffEntity> entityList = baseDao.selectList(getWrapper(params));
+	@Override
+	public List<CustomerStaffDTO> list(Map<String, Object> params) {
+		List<CustomerStaffEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, CustomerStaffDTO.class);
-    }
+		return ConvertUtils.sourceToTarget(entityList, CustomerStaffDTO.class);
+	}
 
-    private QueryWrapper<CustomerStaffEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+	private QueryWrapper<CustomerStaffEntity> getWrapper(Map<String, Object> params) {
+		String id = (String) params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<CustomerStaffEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+		QueryWrapper<CustomerStaffEntity> wrapper = new QueryWrapper<>();
+		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
-        return wrapper;
-    }
+		return wrapper;
+	}
 
-    @Override
-    public CustomerStaffDTO get(String id) {
-        CustomerStaffEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, CustomerStaffDTO.class);
-    }
+	@Override
+	public CustomerStaffDTO get(String id) {
+		CustomerStaffEntity entity = baseDao.selectById(id);
+		return ConvertUtils.sourceToTarget(entity, CustomerStaffDTO.class);
+	}
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(CustomerStaffDTO dto) {
-        CustomerStaffEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStaffEntity.class);
-        insert(entity);
-    }
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void save(CustomerStaffDTO dto) {
+		CustomerStaffEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStaffEntity.class);
+		insert(entity);
+	}
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(CustomerStaffDTO dto) {
-        CustomerStaffEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStaffEntity.class);
-        updateById(entity);
-    }
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void update(CustomerStaffDTO dto) {
+		CustomerStaffEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStaffEntity.class);
+		updateById(entity);
+	}
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delete(String[] ids) {
+		// 逻辑删除（@TableLogic 注解）
+		baseDao.deleteBatchIds(Arrays.asList(ids));
+	}
 
-    @Override
-    public Result<List<CustomerStaffDTO>> getCustsomerStaffByPhone(String mobile) {
-        //判断用户是否存在
-        List<CustomerStaffDTO> customerStaffDTOList = baseDao.selectListCustomerStaffDTO(mobile);
-        if (null == customerStaffDTOList || customerStaffDTOList.size() == 0) {
-            logger.error(String.format("根据手机号查询用户异常,手机号:[%s],code[%s],msg[%s]", mobile, EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getCode(), EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getMsg()));
-            return new Result().error(EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getCode());
-        }
-        return new Result<List<CustomerStaffDTO>>().ok(customerStaffDTOList);
-    }
+	@Override
+	public Result<List<CustomerStaffDTO>> getCustsomerStaffByPhone(String mobile) {
+		//判断用户是否存在
+		List<CustomerStaffDTO> customerStaffDTOList = baseDao.selectListCustomerStaffDTO(mobile);
+		if (null == customerStaffDTOList || customerStaffDTOList.size() == 0) {
+			logger.error(String.format("根据手机号查询用户异常,手机号:[%s],code[%s],msg[%s]", mobile, EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getCode(), EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getMsg()));
+			return new Result().error(EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getCode());
+		}
+		return new Result<List<CustomerStaffDTO>>().ok(customerStaffDTOList);
+	}
 
 
-    @Override
-    public Result<CustomerStaffDTO> getCustomerStaffInfo(CustomerStaffFormDTO formDTO) {
-        CustomerStaffDTO customerStaffDTO = baseDao.selectListCustomerStaffInfo(formDTO);
-        if (null == customerStaffDTO) {
-            logger.error(String.format("根据手机号查询用户异常,手机号:[%s],code[%s],msg[%s]", formDTO.getMobile(), EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getCode(), EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getMsg()));
-            return new Result().error(EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getCode());
-        }
-        //判断用户是否已被禁用
-        if (null != customerStaffDTO && UserConstant.DISABLED.equals(customerStaffDTO.getEnableFlag())) {
-            logger.error(String.format("根据手机号查询用户异常,手机号:[%s],客户id:[%s],code[%s],msg[%s]", formDTO.getMobile(), formDTO.getCustomerId(), EpmetErrorCode.GOV_STAFF_DISABLED.getCode(), EpmetErrorCode.GOV_STAFF_DISABLED.getMsg()));
-            return new Result().error(EpmetErrorCode.GOV_STAFF_DISABLED.getCode());
-        }
-        return new Result<CustomerStaffDTO>().ok(customerStaffDTO);
-    }
+	@Override
+	public Result<CustomerStaffDTO> getCustomerStaffInfo(CustomerStaffFormDTO formDTO) {
+		CustomerStaffDTO customerStaffDTO = baseDao.selectListCustomerStaffInfo(formDTO);
+		if (null == customerStaffDTO) {
+			logger.error(String.format("根据手机号查询用户异常,手机号:[%s],code[%s],msg[%s]", formDTO.getMobile(), EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getCode(), EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getMsg()));
+			return new Result().error(EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getCode());
+		}
+		//判断用户是否已被禁用
+		if (null != customerStaffDTO && UserConstant.DISABLED.equals(customerStaffDTO.getEnableFlag())) {
+			logger.error(String.format("根据手机号查询用户异常,手机号:[%s],客户id:[%s],code[%s],msg[%s]", formDTO.getMobile(), formDTO.getCustomerId(), EpmetErrorCode.GOV_STAFF_DISABLED.getCode(), EpmetErrorCode.GOV_STAFF_DISABLED.getMsg()));
+			return new Result().error(EpmetErrorCode.GOV_STAFF_DISABLED.getCode());
+		}
+		return new Result<CustomerStaffDTO>().ok(customerStaffDTO);
+	}
 
-    @Override
-    public Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) {
-        CustomerStaffDTO customerStaffDTO = baseDao.selectStaffInfoByUserId(formDTO);
-        return new Result<CustomerStaffDTO>().ok(customerStaffDTO);
-    }
+	@Override
+	public Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) {
+		CustomerStaffDTO customerStaffDTO = baseDao.selectStaffInfoByUserId(formDTO);
+		return new Result<CustomerStaffDTO>().ok(customerStaffDTO);
+	}
 
-    @Override
-    public Result<List<StaffGridListDTO>> selectStaffGridListByUserId(List<CustomerStaffGridDTO> customerStaffGridDTOS) {
-        List<StaffGridListDTO> staffGridListDTOS = baseDao.selectStaffGridListByUserId(customerStaffGridDTOS);
-        return new Result<List<StaffGridListDTO>>().ok(staffGridListDTOS);
-    }
+	@Override
+	public Result<List<StaffGridListDTO>> selectStaffGridListByUserId(List<CustomerStaffGridDTO> customerStaffGridDTOS) {
+		List<StaffGridListDTO> staffGridListDTOS = baseDao.selectStaffGridListByUserId(customerStaffGridDTOS);
+		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);
-    }
+	@Override
+	public Result<List<StaffInfoResultDTO>> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
+		List<StaffInfoResultDTO> list = baseDao.selectCustomerStaffList(fromDTO);
+		return new Result<List<StaffInfoResultDTO>>().ok(list);
+	}
+
+	@Override
+	public Result<List<StaffInfoResultDTO>> getStaffList(StaffsInAgencyFromDTO fromDTO) {
+		List<StaffInfoResultDTO> list = baseDao.selectStaffList(fromDTO);
+		return new Result<List<StaffInfoResultDTO>>().ok(list);
+	}
+
+	@Override
+	public Result<StaffInitResultDTO> addStaffInit(StaffInfoFromDTO fromDTO) {
+		StaffInitResultDTO resultDTO = new StaffInitResultDTO();
+		GovStaffRoleDTO govStaffRoleDTO = new GovStaffRoleDTO();
+		govStaffRoleDTO.setCustomerId(fromDTO.getCustomerId());
+		List<GovStaffRoleDTO> roleList = govStaffRoleService.getGovStaffRoleList(govStaffRoleDTO);
+		if (null == roleList || roleList.size() == 0) {
+			return new Result<StaffInitResultDTO>().ok(null);
+		}
+		List<StaffRoleResultDTO> staffRoleList = roleList.stream().map(p -> {
+			StaffRoleResultDTO staffRoleResultDTO = new StaffRoleResultDTO();
+			staffRoleResultDTO.setRoleId(p.getId());
+			staffRoleResultDTO.setRoleName(p.getRoleName());
+			return staffRoleResultDTO;
+		}).collect(Collectors.toList());
+		resultDTO.setRoleList(staffRoleList);
+		return new Result<StaffInitResultDTO>().ok(resultDTO);
+	}
+
+	@Override
+	public Result<StaffInitResultDTO> editStaffInit(StaffInfoFromDTO fromDTO) {
+		StaffInitResultDTO resultDTO = new StaffInitResultDTO();
+		//获取工作人员信息
+		CustomerStaffDTO customerStaffDTO = baseDao.selectStaffInfo(fromDTO);
+		if (null == customerStaffDTO) {
+			log.error("工作人员不存在");
+		}
+		resultDTO.setStaffId(customerStaffDTO.getUserId());
+		resultDTO.setName(customerStaffDTO.getRealName());
+		resultDTO.setGender(customerStaffDTO.getGender());
+		resultDTO.setMobile(customerStaffDTO.getMobile());
+		resultDTO.setWorkType(customerStaffDTO.getWorkType());
+		//获取角色列表
+		GovStaffRoleDTO govStaffRoleDTO = new GovStaffRoleDTO();
+		govStaffRoleDTO.setCustomerId(fromDTO.getCustomerId());
+		List<GovStaffRoleDTO> roleList = govStaffRoleService.getGovStaffRoleList(govStaffRoleDTO);
+		//获取工作人员角色
+		List<GovStaffRoleEntity> staffRoles = govStaffRoleService.listRolesByStaffId(fromDTO.getStaffId(), fromDTO.getAgencyId());
+		List<StaffRoleResultDTO> staffRoleList = roleList.stream().map(p -> {
+			StaffRoleResultDTO staffRoleResultDTO = new StaffRoleResultDTO();
+			staffRoleResultDTO.setRoleId(p.getId());
+			staffRoleResultDTO.setRoleName(p.getRoleName());
+			staffRoleResultDTO.setSelected(false);
+			return staffRoleResultDTO;
+		}).collect(Collectors.toList());
+
+		staffRoleList.forEach(role -> staffRoles.forEach(staffRole -> {
+			if (role.getRoleId().equals(staffRole.getId())) {
+				role.setSelected(true);
+			}
+		}));
+		resultDTO.setRoleList(staffRoleList);
+
+		return new Result<StaffInitResultDTO>().ok(resultDTO);
+	}
+
+	@Override
+	public Result addStaff(StaffSubmitFromDTO fromDTO) {
+		return null;
+	}
+
+	@Override
+	public Result editStaff(StaffSubmitFromDTO fromDTO) {
+		return null;
+	}
+
+	@Override
+	public Result<StaffDetailResultDTO> getStaffDetail(StaffInfoFromDTO fromDTO) {
+		return null;
+	}
+
+	@Override
+	public Result disabledStaff(StaffInfoFromDTO fromDTO) {
+		return null;
+	}
 
     /**
      * 根据userId查询网格下未被禁用的人员数量

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

@@ -110,4 +110,9 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
     public List<GovStaffRoleEntity> listRolesByStaffId(String staffId, String orgId) {
         return baseDao.listRolesByStaffId(staffId, orgId);
     }
+
+    @Override
+    public List<GovStaffRoleDTO> getGovStaffRoleList(GovStaffRoleDTO dto) {
+        return baseDao.selectGovStaffRoleList(dto);
+    }
 }

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

@@ -58,7 +58,7 @@
             cs.USER_ID AS "staffId",
             cs.REAL_NAME AS "staffName",
             cs.GENDER AS "gender",
-            cs.HEAD_PHOTO AS "staffHeadPhoto",
+            IFNULL(cs.HEAD_PHOTO, "") AS "staffHeadPhoto",
             cs.ENABLE_FLAG AS "enableFlag",
             gsr.ROLE_NAME AS "roleName"
         FROM
@@ -72,8 +72,8 @@
         AND gsr.ROLE_KEY = 'agency_leader'
         WHERE
             cs.DEL_FLAG = '0'
-        AND
-            cs.USER_ID in
+        AND cs.CUSTOMER_ID = #{customerId}
+        AND cs.USER_ID in
         <foreach item="userId" collection="staffList" separator="," open="(" close=")" index="">
             #{userId}
         </foreach>
@@ -91,4 +91,40 @@
             cs.DEL_FLAG = '0'
             AND CS.USER_ID =#{userId}
     </select>
+    <select id="selectStaffList" 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",
+        IFNULL(cs.HEAD_PHOTO, "") AS "staffHeadPhoto",
+        cs.ENABLE_FLAG AS "enableFlag"
+        FROM
+        customer_staff cs
+        WHERE
+        cs.DEL_FLAG = '0'
+        AND cs.CUSTOMER_ID = #{customerId}
+        AND cs.USER_ID in
+        <foreach item="userId" collection="staffList" separator="," open="(" close=")" index="">
+            #{userId}
+        </foreach>
+        ORDER BY convert(cs.REAL_NAME using gbk) asc ASC
+    </select>
+    <select id="selectStaffInfo" resultType="com.epmet.dto.CustomerStaffDTO" parameterType="com.epmet.dto.form.StaffInfoFromDTO">
+        SELECT
+            USER_ID,
+            REAL_NAME,
+            MOBILE,
+            GENDER,
+            IFNULL(HEAD_PHOTO, "") AS "headPhoto",
+            ENABLE_FLAG,
+            ACTIVE_FLAG,
+            ACTIVE_TIME,
+            WORK_TYPE
+        FROM
+            customer_staff
+        WHERE
+            DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND USER_ID = #{staffId}
+    </select>
 </mapper>

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

@@ -23,9 +23,20 @@
             r.*
         FROM
             staff_role sr
-            INNER JOIN gov_staff_role r ON ( sr.ROLE_ID = r.ID )
+            INNER JOIN gov_staff_role r ON ( sr.ROLE_ID = r.ID ) AND r.DEL_FLAG = '0'
         WHERE
             sr.STAFF_ID = #{staffId}
             AND sr.ORG_ID = #{orgId}
+            AND sr.DEL_FLAG = '0'
+    </select>
+    <select id="selectGovStaffRoleList" resultType="com.epmet.dto.GovStaffRoleDTO" parameterType="com.epmet.dto.GovStaffRoleDTO">
+        select
+            *
+        from
+            gov_staff_role
+        where
+            DEL_FLAG = '0'
+        AND CUSTOMER_ID = #{customerId}
+        AND ORG_TYPE = 'agency'
     </select>
 </mapper>