修改名称

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitPyFromDTO.java → epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitAccountFromDTO.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-public class StaffSubmitPyFromDTO implements Serializable {
+public class StaffSubmitAccountFromDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
 	/**
 	 * 客户ID

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

@@ -109,9 +109,9 @@ public class StaffController {
 	 */
 	@PostMapping("editstaffpy")
 	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_UPDATE)
-	public Result editStaffPy(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitPyFromDTO fromDTO){
+	public Result editStaffPy(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitAccountFromDTO fromDTO){
 		ValidatorUtils.validateEntity(fromDTO);
-		return staffService.editStaffPy(tokenDto, fromDTO);
+		return staffService.editStaffByAccount(tokenDto, fromDTO);
 	}
 
 	/**
@@ -215,11 +215,11 @@ public class StaffController {
 
 	@PostMapping("addstaffpy")
 	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_CREATE)
-	public Result addStaffPy(@RequestBody StaffSubmitPyFromDTO fromDTO){
+	public Result addStaffPy(@RequestBody StaffSubmitAccountFromDTO fromDTO){
 		fromDTO.setApp("gov");
 		fromDTO.setClient("wxmp");
 		ValidatorUtils.validateEntity(fromDTO);
-		return staffService.addStaffPy(fromDTO);
+		return staffService.addStaffByAccount(fromDTO);
 	}
 
 	/**

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

@@ -97,8 +97,8 @@ public interface EpmetUserFeignClient {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	@PostMapping("/epmetuser/customerstaff/addstaffpy")
-	Result<CustomerStaffDTO> addStaffPy(@RequestBody StaffSubmitPyFromDTO fromDTO);
+	@PostMapping("/epmetuser/customerstaff/addstaffaccount")
+	Result<CustomerStaffDTO> addStaffByAccount(@RequestBody StaffSubmitAccountFromDTO fromDTO);
 
 
 	/**
@@ -116,8 +116,8 @@ public interface EpmetUserFeignClient {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	@PostMapping("/epmetuser/customerstaff/editstaffpy")
-	Result editStaffPy(@RequestBody StaffSubmitPyFromDTO fromDTO);
+	@PostMapping("/epmetuser/customerstaff/editstaffaccount")
+	Result editStaffByAccount(@RequestBody StaffSubmitAccountFromDTO fromDTO);
 
 
 	/**

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

@@ -63,8 +63,8 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     }
 
     @Override
-    public Result<CustomerStaffDTO> addStaffPy(StaffSubmitPyFromDTO fromDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addStaffPy", fromDTO);
+    public Result<CustomerStaffDTO> addStaffByAccount(StaffSubmitAccountFromDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addStaffByAccount", fromDTO);
     }
 
     @Override
@@ -73,8 +73,8 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     }
 
     @Override
-    public Result editStaffPy(StaffSubmitPyFromDTO fromDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "editStaffPy", fromDTO);
+    public Result editStaffByAccount(StaffSubmitAccountFromDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "editStaffByAccount", fromDTO);
     }
 
     @Override

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

@@ -70,7 +70,7 @@ public interface StaffService {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	Result editStaffPy(TokenDto tokenDto, StaffSubmitPyFromDTO fromDTO);
+	Result editStaffByAccount(TokenDto tokenDto, StaffSubmitAccountFromDTO fromDTO);
 
 	/**
 	 * 人员详情
@@ -143,7 +143,7 @@ public interface StaffService {
 	 * 【通讯录】人员添加-平阴
 	 * @author zhy
 	 */
-	Result addStaffPy(StaffSubmitPyFromDTO fromDTO);
+	Result addStaffByAccount(StaffSubmitAccountFromDTO fromDTO);
 
 	/**
 	 * @Description 工作人员所属组织

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

@@ -196,13 +196,13 @@ public class StaffServiceImpl implements StaffService {
 	}
 
 	@Override
-	public Result editStaffPy(TokenDto tokenDto, StaffSubmitPyFromDTO fromDTO) {
+	public Result editStaffByAccount(TokenDto tokenDto, StaffSubmitAccountFromDTO fromDTO) {
 		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
 		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
 
 		fromDTO.setApp(tokenDto.getApp());
 		fromDTO.setClient(tokenDto.getClient());
-		Result result = epmetUserFeignClient.editStaffPy(fromDTO);
+		Result result = epmetUserFeignClient.editStaffByAccount(fromDTO);
 		if (!result.success()) {
 			if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) {
 				return new Result().error(result.getCode(), result.getMsg());
@@ -603,12 +603,12 @@ public class StaffServiceImpl implements StaffService {
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Result addStaffPy(StaffSubmitPyFromDTO fromDTO) {
+	public Result addStaffByAccount(StaffSubmitAccountFromDTO fromDTO) {
 		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
 		//fromDTO.setApp(tokenDto.getApp());
 		//fromDTO.setClient(tokenDto.getClient());
 		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
-		Result<CustomerStaffDTO> result = epmetUserFeignClient.addStaffPy(fromDTO);
+		Result<CustomerStaffDTO> result = epmetUserFeignClient.addStaffByAccount(fromDTO);
 
 		if (!result.success()) {
 			if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) {

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

@@ -263,9 +263,9 @@ public class CustomerStaffController {
      * @param fromDTO 参数
      * @return Result
      */
-    @PostMapping("addstaffpy")
-    public Result<CustomerStaffDTO> addStaffPy(@RequestBody StaffSubmitPyFromDTO fromDTO){
-        Result<CustomerStaffDTO> result = customerStaffService.addStaffPy(fromDTO);
+    @PostMapping("addstaffaccount")
+    public Result<CustomerStaffDTO> addStaffByAccount(@RequestBody StaffSubmitAccountFromDTO fromDTO){
+        Result<CustomerStaffDTO> result = customerStaffService.addStaffByAccount(fromDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
         if (result.success()) {
@@ -311,9 +311,9 @@ public class CustomerStaffController {
      * @param fromDTO 参数
      * @return Result
      */
-    @PostMapping("editstaffpy")
-    public Result editStaffPy(@RequestBody StaffSubmitPyFromDTO fromDTO){
-        Result result = customerStaffService.editStaffPy(fromDTO);
+    @PostMapping("editstaffaccount")
+    public Result editStaffByAccount(@RequestBody StaffSubmitAccountFromDTO fromDTO){
+        Result result = customerStaffService.editStaffByAccount(fromDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
         if (result.success()) {

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

@@ -193,7 +193,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	Result<CustomerStaffDTO> addStaffPy(StaffSubmitPyFromDTO fromDTO);
+	Result<CustomerStaffDTO> addStaffByAccount(StaffSubmitAccountFromDTO fromDTO);
 
 
 	/**
@@ -210,7 +210,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	Result editStaffPy(StaffSubmitPyFromDTO fromDTO);
+	Result editStaffByAccount(StaffSubmitAccountFromDTO fromDTO);
 
 	/**
 	 * 人员详情

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

@@ -374,7 +374,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<CustomerStaffDTO> addStaffPy(StaffSubmitPyFromDTO fromDTO) {
+    public Result<CustomerStaffDTO> addStaffByAccount(StaffSubmitAccountFromDTO fromDTO) {
         CustomerStaffFormDTO customerStaffFormDTO = new CustomerStaffFormDTO();
         customerStaffFormDTO.setCustomerId(fromDTO.getCustomerId());
         customerStaffFormDTO.setMobile(fromDTO.getMobile());
@@ -511,7 +511,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result editStaffPy(StaffSubmitPyFromDTO fromDTO) {
+    public Result editStaffByAccount(StaffSubmitAccountFromDTO fromDTO) {
         CustomerStaffFormDTO customerStaffFormDTO = new CustomerStaffFormDTO();
         customerStaffFormDTO.setCustomerId(fromDTO.getCustomerId());
         customerStaffFormDTO.setMobile(fromDTO.getMobile());