From 9529831a87f6004246a5f808612514fd108db03a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 11 May 2022 11:02:28 +0800
Subject: [PATCH] moveOutResi=>moveResi

---
 .../java/com/epmet/service/IcUserTransferRecordService.java   | 2 +-
 .../java/com/epmet/service/impl/ChangeDeathServiceImpl.java   | 2 +-
 .../com/epmet/service/impl/ChangeRelocationServiceImpl.java   | 2 +-
 .../com/epmet/service/impl/IcMoveInRecordServiceImpl.java     | 4 ++--
 .../epmet/service/impl/IcUserTransferRecordServiceImpl.java   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
index 63207ede16..4caf8570ba 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
@@ -41,5 +41,5 @@ public interface IcUserTransferRecordService extends BaseService<IcUserTransferR
      * 迁入、出生也调用此方法
      * @param formDTO
      */
-    void moveOutResi(IcResiUserTransferFormDTO formDTO);
+    void moveResi(IcResiUserTransferFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java
index 8a8a0a9866..4b098f8ffb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java
@@ -156,7 +156,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
         icResiUserTransferFormDTO.setOrigin(IcResiUserConstant.DIED);
         //死亡原因
         icResiUserTransferFormDTO.setReason(dto.getJoinReason());
-        SpringContextUtils.getBean(IcUserTransferRecordService.class).moveOutResi(icResiUserTransferFormDTO);
+        SpringContextUtils.getBean(IcUserTransferRecordService.class).moveResi(icResiUserTransferFormDTO);
         //推送MQ事件
         changeRelocationServiceImpl.editResiMq(formDTO.getCustomerId(), dto.getUserId());
         return new Result();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
index c7508f9190..e3ce0a45f9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
@@ -203,7 +203,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         icResiUserTransferFormDTO.setNewHouseId(dto.getHomeId());
         // icResiUserTransferFormDTO.setMoveType(IcResiUserConstant.OUT);
         icResiUserTransferFormDTO.setOrigin(IcResiUserConstant.OUT);
-        SpringContextUtils.getBean(IcUserTransferRecordService.class).moveOutResi(icResiUserTransferFormDTO);
+        SpringContextUtils.getBean(IcUserTransferRecordService.class).moveResi(icResiUserTransferFormDTO);
         //推送MQ事件
         editResiMq(dto.getCustomerId(), dto.getIcUserId());
         return new Result();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
index f8935b07c4..df78445f0a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
@@ -195,7 +195,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 entity.setId(resiDTO.getIcResiUserId());
                 icResiUserService.updateById(entity);
                 change.setIcUserId(entity.getId());
-                icUserTransferRecordService.moveOutResi(change);
+                icUserTransferRecordService.moveResi(change);
             } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && !staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())) {
                 //4-3.非本社区下游离状态居民【更新居民信息，生成变更记录、变更明细】
                 entity.setId(resiDTO.getIcResiUserId());
@@ -203,7 +203,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 entity.setPids(staffInfo.getAgencyPIds());
                 icResiUserService.updateById(entity);
                 change.setIcUserId(entity.getId());
-                icUserTransferRecordService.moveOutResi(change);
+                icUserTransferRecordService.moveResi(change);
             } else if (StringUtils.isBlank(resiDTO.getResiAgencyId())) {
                 //4-4.客户下不存在的居民(新数据)【新增居民信息，不生成变更记录、变更明细(因为十八类默认都是否)】
                 entity.setAgencyId(staffInfo.getAgencyId());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
index 87845f425c..4e66a174a1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
@@ -327,7 +327,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void moveOutResi(IcResiUserTransferFormDTO formDTO) {
+    public void moveResi(IcResiUserTransferFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, IcResiUserTransferFormDTO.TransferAdd.class);
         //1.判断被调动人员是否有效
         IcResiUserDTO resiUserDTO = getIcResiUserDTO(formDTO.getCustomerId(), formDTO.getIcUserId());