change

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

@@ -343,8 +343,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
 
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
         IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();
-        //5.生成调动记录:  只有迁出的才生成居民调动记录表ic_user_transfer_record记录
-        if(IcResiUserConstant.OUT.equals(formDTO.getOrigin())){
+        //5.生成调动记录:  只有迁出，或者房屋变更的才生成居民调动记录表ic_user_transfer_record记录
+        if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) {
             IcUserTransferRecordEntity recordEntity = saveTransferRecord(staffInfoCache, formDTO, resiUserDTO, icResiUserOrgMsgResultDTO, result2.getData());
             insert(recordEntity);
             changeRecordEntity.setIcUserTransferRecordId(recordEntity.getId());
@@ -371,8 +371,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
             changeRecordEntity.setType("add");
             changeRecordEntity.setTypeName("新增");
         }
-        //只有迁出才会赋值变更前，变更后这两句话
-        if (IcResiUserConstant.OUT.equals(formDTO.getOrigin())) {
+        //只有迁出、变动才会赋值变更前，变更后这两句话
+        if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) {
             StringBuffer beforeName = new StringBuffer();
             beforeName.append(icResiUserOrgMsgResultDTO.getAgencyDTO().getOrganizationName()).append("-").append(icResiUserOrgMsgResultDTO.getGridDTO().getGridName()).append("-")
                     .append(icResiUserOrgMsgResultDTO.getNeighborHoodDTO().getNeighborHoodName()).append("-").append(icResiUserOrgMsgResultDTO.getBuildingDTO().getBuildingName()).append("-")