Merge remote-tracking branch 'origin/dev_govorg' into dev

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

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -34,5 +35,6 @@ public class StaffInfoResultDTO implements Serializable {
 	/**
 	 * 权限名
 	 */
+	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private String roleName;
 }

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

@@ -1,6 +1,6 @@
 package com.epmet.dto.result;
 
-import lombok.Builder;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -21,8 +21,13 @@ public class StaffRoleResultDTO implements Serializable {
 	 * 角色名称
 	 */
 	private String roleName;
+	/**
+	 * true，false专职可选全部
+	 */
+	private String fullTimeOnly;
 	/**
 	 * 是否选中(选中的是true)
 	 */
+	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private Boolean selected;
 }

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

@@ -8,10 +8,7 @@ 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.dto.result.*;
 import com.epmet.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -61,7 +58,7 @@ public class StaffController {
 	 * @return Result<StaffInitResultDTO>
 	 */
 	@PostMapping("rolelist")
-	public Result<StaffInitResultDTO> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
+	public Result<List<StaffRoleResultDTO>> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
 		return staffService.addStaffInit(fromDTO);
 	}
 

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

@@ -83,7 +83,7 @@ public interface EpmetUserFeignClient {
 	 * @return Result<StaffInitResultDTO>
 	 */
 	@PostMapping("/epmetuser/customerstaff/rolelist")
-	Result<StaffInitResultDTO> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO);
+	Result<List<StaffRoleResultDTO>> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO);
 
 	/**
 	 * 人员编辑页面初始化

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

@@ -63,7 +63,7 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     }
 
     @Override
-    public Result<StaffInitResultDTO> addStaffInit(StaffInfoFromDTO fromDTO) {
+    public Result<List<StaffRoleResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addStaffInit", fromDTO);
     }
 

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

@@ -5,10 +5,7 @@ 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.dto.result.*;
 
 import java.util.List;
 
@@ -43,7 +40,7 @@ public interface StaffService {
 	 * @param fromDTO 参数
 	 * @return Result<StaffInitResultDTO>
 	 */
-	Result<StaffInitResultDTO> addStaffInit(StaffInfoFromDTO fromDTO);
+	Result<List<StaffRoleResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO);
 
 	/**
 	 * 人员编辑页面初始化

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

@@ -8,10 +8,7 @@ import com.epmet.dto.CustomerStaffDTO;
 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.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import com.epmet.feign.EpmetUserFeignClient;
@@ -53,7 +50,7 @@ public class StaffServiceImpl implements StaffService {
 			resultDTO.setStaffCount(0);
 			return new Result<StaffsInAgencyResultDTO>().ok(resultDTO);
 		}
-		resultDTO.setStaffCount(customerAgencyEntity.getTotalUser());
+		resultDTO.setStaffCount(customerAgencyEntity.getTotalUser() == null ? 0 : customerAgencyEntity.getTotalUser());
 		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
 		List<CustomerStaffAgencyDTO> customerStaffAgencyList = customerStaffAgencyService.getCustomerStaffAgencyList(fromDTO).getData();
 		if (null == customerStaffAgencyList || customerStaffAgencyList.size() == 0) {
@@ -89,7 +86,7 @@ public class StaffServiceImpl implements StaffService {
 	}
 
 	@Override
-	public Result<StaffInitResultDTO> addStaffInit(StaffInfoFromDTO fromDTO) {
+	public Result<List<StaffRoleResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO) {
 		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
 		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
 		return epmetUserFeignClient.addStaffInit(fromDTO);

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

@@ -31,15 +31,11 @@ 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;
-import com.epmet.dto.result.StaffInitResultDTO;
+import com.epmet.dto.result.*;
 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.result.CommonStaffInfoResultDTO;
 import com.epmet.excel.CustomerStaffExcel;
 import com.epmet.service.CustomerStaffService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -197,7 +193,7 @@ public class CustomerStaffController {
      * @return Result<StaffInitResultDTO>
      */
     @PostMapping("rolelist")
-    public Result<StaffInitResultDTO> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
+    public Result<List<StaffRoleResultDTO>> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
         return customerStaffService.addStaffInit(fromDTO);
     }
 

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

@@ -32,11 +32,7 @@ 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;
-import com.epmet.dto.result.StaffInitResultDTO;
-import com.epmet.dto.result.CommonStaffInfoResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerStaffEntity;
 
 import java.util.List;
@@ -165,7 +161,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @param fromDTO 参数
 	 * @return Result<StaffInitResultDTO>
 	 */
-	Result<StaffInitResultDTO> addStaffInit(StaffInfoFromDTO fromDTO);
+	Result<List<StaffRoleResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO);
 
 	/**
 	 * 人员编辑页面初始化

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

@@ -201,13 +201,12 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	}
 
 	@Override
-	public Result<StaffInitResultDTO> addStaffInit(StaffInfoFromDTO fromDTO) {
-		StaffInitResultDTO resultDTO = new StaffInitResultDTO();
+	public Result<List<StaffRoleResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO) {
 		GovStaffRoleDTO govStaffRoleDTO = new GovStaffRoleDTO();
 		govStaffRoleDTO.setCustomerId(fromDTO.getCustomerId());
 		List<GovStaffRoleDTO> roleList = govStaffRoleService.getGovStaffRoleList(govStaffRoleDTO);
 		if (null == roleList || roleList.size() == 0) {
-			return new Result<StaffInitResultDTO>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+			return new Result<List<StaffRoleResultDTO>>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
 		List<StaffRoleResultDTO> staffRoleList = roleList.stream().map(p -> {
 			StaffRoleResultDTO staffRoleResultDTO = new StaffRoleResultDTO();
@@ -215,8 +214,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 			staffRoleResultDTO.setRoleName(p.getRoleName());
 			return staffRoleResultDTO;
 		}).collect(Collectors.toList());
-		resultDTO.setRoleList(staffRoleList);
-		return new Result<StaffInitResultDTO>().ok(resultDTO);
+		return new Result<List<StaffRoleResultDTO>>().ok(staffRoleList);
 	}
 
 	@Override

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

@@ -64,7 +64,7 @@
         cs.GENDER AS "gender",
         IFNULL( cs.HEAD_PHOTO, "" ) AS "staffHeadPhoto",
         cs.ENABLE_FLAG AS "enableFlag",
-        role.ROLE_NAME AS "roleName"
+        IFNULL( role.ROLE_NAME, "" ) AS "roleName"
         FROM
         customer_staff cs
         LEFT JOIN (
@@ -85,6 +85,7 @@
         WHERE
         cs.DEL_FLAG = '0'
         AND cs.CUSTOMER_ID = #{customerId}
+        AND cs.ENABLE_FLAG = 'enable'
         AND cs.USER_ID IN
         <foreach item="userId" collection="staffList" separator="," open="(" close=")" index="">
             #{userId}