添加部门人员

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

@@ -0,0 +1,27 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 根据userId查询customerId 的DTO
+ * @Auther zxc
+ * @Create 2020-04-24 15:57
+ */
+@Data
+public class CustomerIdDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * userId  用户id
+     */
+    private String userId;
+
+    /**
+     * customerId 客户id
+     */
+    private String customerId;
+
+}

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

@@ -16,20 +16,10 @@ package com.epmet.dto.form;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
-
-/**
- * 添加部门人员DTO
- * @Auther zxc
- * @Create 2020-04-24 14:51
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
 
 /**
  * 添加部门-接口入参
@@ -41,16 +31,6 @@ public class AddDepartmentFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     *部门id
-     */
-    private String departmentId;
-
-    /**
-     * 选中人员id
-     */
-    private List<String> selectedList;
-
     /**
      * 所属组织机构ID（customer_agency.id）
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentStaffFormDTO.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;
+
+/**
+ * 添加部门人员DTO
+ * @Auther zxc
+ * @Create 2020-04-24 14:51
+ */
+@Data
+public class AddDepartmentStaffFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *部门id
+     */
+    @NotBlank(message = "部门id不能为空")
+    private String departmentId;
+
+    /**
+     * 选中人员id
+     */
+    @NotBlank(message = "选中人员不能为空")
+    private List selectedList;
+
+}

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

@@ -29,9 +29,15 @@ public class DepartmentController {
     @Autowired
     private DepartmentService departmentService;
 
+    /**
+     * 添加部门人员
+     * @param tokenDto
+     * @param addDepartmentStaffFormDTO
+     * @return
+     */
     @PostMapping(value = "adddepartmentstaff")
-    public Result addDepartmentStaff(@LoginUser TokenDto tokenDto, @RequestBody AddDepartmentFormDTO addDepartmentFormDTO){
+    public Result addDepartmentStaff(@LoginUser TokenDto tokenDto, @RequestBody AddDepartmentStaffFormDTO addDepartmentStaffFormDTO){
-        return null;
+        return departmentService.addDepartmentStaff(tokenDto,addDepartmentStaffFormDTO);
     }
 
     /**

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

@@ -34,4 +34,11 @@ import java.util.List;
 public interface CustomerStaffDepartmentDao extends BaseDao<CustomerStaffDepartmentEntity> {
 
     List<String> selectUserIdByDepartmentId(@Param("departmentId") String departmentId);
+
+    /**
+     * 修改部门人数
+     * @param
+     * @auther zxc
+     */
+    void updateDepartmentStaffCount(@Param("addCount")Integer addCount,@Param("departmentId")String departmentId);
 }

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

@@ -3,6 +3,10 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
+import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.StaffGridListDTO;
+import com.epmet.dto.form.AddDepartmentStaffFormDTO;
 import com.epmet.dto.form.DepartmentInStaffFormDTO;
 import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.form.StaffSubmitFromDTO;
@@ -36,6 +40,11 @@ public interface EpmetUserFeignClient {
 	@PostMapping(value = "/epmetuser/customerstaff/getstaffinfobyuserid")
 	Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(@RequestBody CustomerStaffDTO formDTO);
 
+	/**
+	 * 获取网格下人员具体信息(头像、名字...)
+	 * @param customerStaffGridDTOS
+	 * @return
+	 */
     @PostMapping("/epmetuser/customerstaff/selectstaffgridlistbyuserid")
     Result<List<StaffGridListDTO>> getStaffGridList(@RequestBody List<CustomerStaffGridDTO> customerStaffGridDTOS);
 
@@ -47,6 +56,11 @@ public interface EpmetUserFeignClient {
 	@PostMapping("/epmetuser/customerstaff/staffsinagency")
 	Result<List<StaffInfoResultDTO>> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO);
 
+	/**
+	 * 获取网格下未禁用的人员数量
+	 * @param userIdDTO
+	 * @return
+	 */
     @PostMapping(value = "/epmetuser/customerstaff/selectgridstaffcountbyuserid")
 	Result<GridStaffCountDTO> selectGridStaffCountByUserId(@RequestBody UserIdDTO userIdDTO);
 
@@ -120,4 +134,12 @@ public interface EpmetUserFeignClient {
 	@PostMapping("/epmetuser/customerstaff/getdepartmentstafflist")
 	Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO departmentInStaffFormDTO);
 
+	/**
+	 *	根据userId查询customerId
+	 * @param  addDepartmentStaffFormDTO
+	 * @auther zxc
+	 */
+	@PostMapping("/epmetuser/customerstaff/selectcustomeridbyuserid")
+	Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO);
+
 }

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

@@ -4,6 +4,10 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
+import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.StaffGridListDTO;
+import com.epmet.dto.form.AddDepartmentStaffFormDTO;
 import com.epmet.dto.form.DepartmentInStaffFormDTO;
 import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.form.StaffSubmitFromDTO;
@@ -82,4 +86,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result disabledStaff(StaffInfoFromDTO fromDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "disabledStaff", fromDTO);
     }
+    @Override
+    public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectCustomerIdByUserId", addDepartmentStaffFormDTO);
+    }
+
 }

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

@@ -17,7 +17,9 @@
 
 package com.epmet.service;
 
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 
@@ -77,4 +79,11 @@ public interface DepartmentService {
      * @Description 获取机构下部门列表
      */
     Result<List<DepartmentListResultDTO>> departmentList(DepartmentListFormDTO formDTO);
+
+    /**
+     * 添加部门人员
+     * @param addDepartmentStaffFormDTO
+     * @return
+     */
+    Result addDepartmentStaff(TokenDto tokenDto,AddDepartmentStaffFormDTO addDepartmentStaffFormDTO);
 }

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

@@ -177,6 +177,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     public Result<GridDetailResultDTO> griddetail(CustomerGridFormDTO customerGridFormDTO) {
         GridDetailResultDTO griddetail = baseDao.griddetail(customerGridFormDTO);
         List<CustomerStaffGridDTO> customerStaffGridDTOS = baseDao.selectUserIdByGridId(customerGridFormDTO);
+        //获取人员具体信息(头像、名字...)
         Result<List<StaffGridListDTO>> staffGridList = epmetUserFeignClient.getStaffGridList(customerStaffGridDTOS);
         griddetail.setStaffGridList(staffGridList.getData());
         return new Result<GridDetailResultDTO>().ok(griddetail);

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

@@ -20,17 +20,20 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerDepartmentConstant;
 import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dao.CustomerDepartmentDao;
 import com.epmet.dao.CustomerStaffDepartmentDao;
+import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.StaffRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerDepartmentEntity;
+import com.epmet.entity.CustomerStaffDepartmentEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.service.DepartmentService;
 import com.epmet.util.ModuleConstant;
@@ -197,4 +200,30 @@ public class DepartmentServiceImpl implements DepartmentService {
         List<DepartmentListResultDTO> departmentList = customerDepartmentDao.selectDepartmentList(formDTO.getAgencyId());
         return new Result<List<DepartmentListResultDTO>>().ok(departmentList);
     }
+
+    /**
+     * 添加部门人员
+     * @param tokenDto
+     * @param addDepartmentStaffFormDTO
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result addDepartmentStaff(TokenDto tokenDto,AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
+        CustomerStaffDepartmentEntity customerStaffDepartmentEntity = new CustomerStaffDepartmentEntity();
+        Result<List<CustomerIdDTO>> listResult = epmetUserFeignClient.selectCustomerIdByUserId(addDepartmentStaffFormDTO);
+        List<CustomerIdDTO> data = listResult.getData();
+        customerStaffDepartmentEntity.setDepartmentId(addDepartmentStaffFormDTO.getDepartmentId());
+        customerStaffDepartmentEntity.setCreatedBy(tokenDto.getUserId());
+        customerStaffDepartmentEntity.setUpdatedBy(tokenDto.getUserId());
+        customerStaffDepartmentEntity.setDelFlag("0");
+        customerStaffDepartmentEntity.setRevision(0);
+        for (CustomerIdDTO customerIdDTO : data) {
+            customerStaffDepartmentEntity.setUserId(customerIdDTO.getUserId());
+            customerStaffDepartmentEntity.setCustomerId(customerIdDTO.getCustomerId());
+            customerStaffDepartmentDao.insert(customerStaffDepartmentEntity);
+        }
+        customerStaffDepartmentDao.updateDepartmentStaffCount(data.size(),addDepartmentStaffFormDTO.getDepartmentId());
+        return new Result();
+    }
 }

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

@@ -26,5 +26,15 @@
 
     </select>
 
+    <!-- 修改部门人数 -->
+    <update id="updateDepartmentStaffCount">
+        UPDATE
+            customer_department
+        SET
+            total_user = total_user + #{addCount}
+        WHERE
+            id = #{departmentId}
+    </update>
+
 
 </mapper>

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

@@ -27,6 +27,10 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
+import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.StaffGridListDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.DepartInStaffListResultDTO;
 import com.epmet.dto.result.StaffDetailResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
@@ -145,18 +149,13 @@ public class CustomerStaffController {
         return customerStaffService.getCustomerStaffInfoByUserId(formDTO);
     }
 
-    @PostMapping(value = "selectgridstaffcountbyuserid")
-    public Result<GridStaffCountDTO> selectGridStaffCountByUserId(@RequestBody UserIdDTO userIdDTO){
-        return customerStaffService.selectGridStaffCountByUserId(userIdDTO);
-    }
-
     /**
      * 组织首页-工作人员列表
      * @param fromDTO
      * @return
      */
     @PostMapping("staffsinagency")
-    public Result<List<StaffInfoResultDTO>> getStaffInfoForHome(@RequestBody StaffsInAgencyFromDTO fromDTO) {
+    public Result<List<StaffInfoResultDTO>> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
         return customerStaffService.getStaffInfoForHome(fromDTO);
     }
 
@@ -166,74 +165,18 @@ public class CustomerStaffController {
      * @return
      */
     @PostMapping("stafflist")
-    public Result<List<StaffInfoResultDTO>> getStaffList(@RequestBody StaffsInAgencyFromDTO fromDTO) {
+    public Result<List<StaffInfoResultDTO>> getStaffList(StaffsInAgencyFromDTO fromDTO) {
         return customerStaffService.getStaffList(fromDTO);
     }
 
     /**
-     * 人员添加页面初始化
+     * 查询网格下未被禁用人员
-     *
+     * @param  userIdDTO
-     * @param fromDTO 参数
+     * @auther zxc
-     * @return Result<StaffInitResultDTO>
      */
-    @PostMapping("rolelist")
+    @PostMapping(value = "selectgridstaffcountbyuserid")
-    public Result<StaffInitResultDTO> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
+    public Result<GridStaffCountDTO> selectGridStaffCountByUserId(@RequestBody UserIdDTO userIdDTO){
-        return customerStaffService.addStaffInit(fromDTO);
+        return customerStaffService.selectGridStaffCountByUserId(userIdDTO);
-    }
-
-    /**
-     * 人员编辑页面初始化
-     *
-     * @param fromDTO 参数
-     * @return Result<StaffInitResultDTO>
-     */
-    @PostMapping("editstaffinit")
-    public Result<StaffInitResultDTO> editStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
-        return customerStaffService.editStaffInit(fromDTO);
-    }
-
-    /**
-     * 人员添加
-     *
-     * @param fromDTO 参数
-     * @return Result
-     */
-    @PostMapping("addstaff")
-    public Result addStaff(@RequestBody StaffSubmitFromDTO fromDTO){
-        return customerStaffService.addStaff(fromDTO);
-    }
-
-    /**
-     * 人员编辑
-     *
-     * @param fromDTO 参数
-     * @return Result
-     */
-    @PostMapping("editstaff")
-    public Result editStaff(@RequestBody StaffSubmitFromDTO fromDTO){
-        return customerStaffService.editStaff(fromDTO);
-    }
-
-    /**
-     * 人员详情
-     *
-     * @param fromDTO 参数
-     * @return Result<StaffDetailResultDTO>
-     */
-    @PostMapping("staffdetail")
-    public Result<StaffDetailResultDTO> getStaffDetail(@RequestBody StaffInfoFromDTO fromDTO){
-        return customerStaffService.getStaffDetail(fromDTO);
-    }
-
-    /**
-     * 人员禁用
-     *
-     * @param fromDTO 参数
-     * @return Result
-     */
-    @PostMapping("disabledstaff")
-    public Result disabledStaff(@RequestBody StaffInfoFromDTO fromDTO){
-        return customerStaffService.disabledStaff(fromDTO);
     }
 
     /**
@@ -246,4 +189,9 @@ public class CustomerStaffController {
     public Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO fromDTO) {
         return customerStaffService.getDepartmentStaffList(fromDTO);
     }
+
+    @PostMapping(value = "selectcustomeridbyuserid")
+    public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(@RequestBody AddDepartmentStaffFormDTO addDepartmentStaffFormDTO){
+        return customerStaffService.selectCustomerIdByUserId(addDepartmentStaffFormDTO);
+    }
 }

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

@@ -20,10 +20,7 @@ package com.epmet.dao;
 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.*;
-import com.epmet.dto.form.StaffInfoFromDTO;
-import com.epmet.dto.form.DepartmentInStaffFormDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.DepartInStaffListResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
@@ -115,4 +112,11 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @Description 根据客户Id及userId集合查询用户基本信息
 	 */
     List<DepartInStaffListResultDTO> selectDepartmentStaffList(DepartmentInStaffFormDTO fromDTO);
+
+    /**
+     *
+     * @param  departmentStaffFormDTO
+     * @auther zxc
+     */
+    List<CustomerIdDTO> selectCustomerIdByUserId(AddDepartmentStaffFormDTO departmentStaffFormDTO);
 }

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

@@ -21,15 +21,10 @@ 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.*;
-import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.form.*;
 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.DepartmentInStaffFormDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.StaffDetailResultDTO;
 import com.epmet.dto.result.DepartInStaffListResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
@@ -218,4 +213,11 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Description 根据客户Id及userId集合查询用户基本信息
 	 */
 	Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO fromDTO);
+
+	/**
+	 *	根据userId查询customerId
+	 * @param:	addDepartmentStaffFormDTO
+	 * @auther: zxc
+	 */
+	Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO);
 }

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

@@ -32,6 +32,17 @@ import com.epmet.dao.CustomerStaffDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.dto.form.*;
+import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.GovStaffRoleDTO;
+import com.epmet.dto.StaffGridListDTO;
+import com.epmet.dto.StaffRoleDTO;
+import com.epmet.dto.result.StaffDetailResultDTO;
+import com.epmet.dto.result.DepartInStaffListResultDTO;
+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.entity.StaffRoleEntity;
@@ -352,4 +363,14 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		return new Result<List<DepartInStaffListResultDTO>>().ok(staffList);
 	}
 
+    /**
+     *
+     * @param: addDepartmentStaffFormDTO
+     * @auther: zxc
+     */
+	@Override
+	public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
+		return new Result<List<CustomerIdDTO>>().ok(baseDao.selectCustomerIdByUserId(addDepartmentStaffFormDTO));
+	}
+
 }

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

@@ -145,4 +145,20 @@
         </foreach>
         ORDER BY CONVERT (real_name USING gbk) ASC<!--按中文对应的拼音升序排列-->
     </select>
+
+    <!-- 根据userId查询customerId -->
+    <select id="selectCustomerIdByUserId" parameterType="com.epmet.dto.form.AddDepartmentStaffFormDTO" resultType="com.epmet.dto.CustomerIdDTO">
+        SELECT
+            user_id AS userId,
+            customer_id AS customerId
+        FROM
+            customer_staff
+        WHERE
+            user_id in
+            <foreach item="item" collection="selectedList" separator="," open="(" close=")" index="">
+                #{item}
+            </foreach>
+            AND del_flag = 0
+            AND enable_flag = 'enable'
+    </select>
 </mapper>