迁出人员管理增加恢复按钮，点击恢复按钮，恢复居民的信息到居民信息中，迁出人员管理中删除该居民的迁出记录，并增加变更记录；当迁出的居民已经被迁入，则不显示恢复按钮，不能恢复

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java

@@ -29,6 +29,11 @@ public class ChangeRelocationDTO implements Serializable {
      */
     private String icResiUserId;
 
+    /**
+     * ic_resi_user 用户状态
+     */
+    private String status;
+
     /**
      * 姓名
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java → epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @dscription
  */
 @Data
-public class DeleteIcBirthRecordFormDTO implements Serializable {
+public class OnlyIdFormDTO implements Serializable {
 
 	private static final long serialVersionUID = -5220529162950147825L;
 	/**

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

@@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ChangeRelocationDTO;
+import com.epmet.dto.form.OnlyIdFormDTO;
 import com.epmet.excel.ChangeRelocationExcel;
 import com.epmet.service.ChangeRelocationService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -144,4 +145,18 @@ public class ChangeRelocationController {
         return new Result();
     }
 
+    /**
+     * 恢复迁出人员
+     * @param tokenDto
+     * @param dto
+     * @return
+     */
+    @PostMapping("recovery")
+    public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        changeRelocationService.recovery(tokenDto,dto);
+        return new Result();
+    }
+
 }

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

@@ -24,7 +24,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcBirthRecordDTO;
 import com.epmet.dto.form.BirthRecordFormDTO;
 import com.epmet.dto.form.BirthRecordUpdateDTO;
-import com.epmet.dto.form.DeleteIcBirthRecordFormDTO;
+import com.epmet.dto.form.OnlyIdFormDTO;
 import com.epmet.excel.IcBirthRecordExcel;
 import com.epmet.service.IcBirthRecordService;
 import lombok.extern.slf4j.Slf4j;
@@ -94,7 +94,7 @@ public class IcBirthRecordController {
     }
 
     @PostMapping("deleteById")
-    public Result deleteById(@RequestBody DeleteIcBirthRecordFormDTO dto) {
+    public Result deleteById(@RequestBody OnlyIdFormDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         icBirthRecordService.deleteById(dto.getId());

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

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcMoveInRecordDTO;
+import com.epmet.dto.form.OnlyIdFormDTO;
 import com.epmet.dto.form.IcMoveInAddEditFormDTO;
 import com.epmet.dto.form.IcMoveInListFormDTO;
 import com.epmet.dto.result.IcMoveInListResultDTO;
@@ -95,6 +96,14 @@ public class IcMoveInRecordController {
         return new Result();
     }
 
+    @PostMapping("deleteById")
+    public Result deleteById(@RequestBody OnlyIdFormDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icMoveInRecordService.deleteById(dto.getId());
+        return new Result();
+    }
+
     @NoRepeatSubmit
     @PostMapping("export")
     public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws IOException {

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

@@ -2,8 +2,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.ChangeRelocationDTO;
+import com.epmet.dto.form.OnlyIdFormDTO;
 import com.epmet.entity.ChangeRelocationEntity;
 
 import java.util.List;
@@ -105,4 +107,12 @@ public interface ChangeRelocationService extends BaseService<ChangeRelocationEnt
      * @Date 2022/6/27 10:52
      */
     void moveOutHomeConfirm(ChangeRelocationDTO dto);
+
+    /**
+     * 恢复迁出人员
+     * @return
+     */
+    void recovery(TokenDto tokenDto,OnlyIdFormDTO dto);
+
+
 }

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

@@ -6,12 +6,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -23,15 +26,18 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.constant.IcResiUserConstant;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dao.ChangeRelocationDao;
+import com.epmet.dao.IcResiUserDao;
 import com.epmet.dto.ChangeRelocationDTO;
 import com.epmet.dto.ChangeWelfareDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.IcResiUserTransferFormDTO;
+import com.epmet.dto.form.OnlyIdFormDTO;
 import com.epmet.dto.form.RentTenantDataFormDTO;
 import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.result.RentTenantDataResultDTO;
 import com.epmet.entity.ChangeRelocationEntity;
 import com.epmet.entity.IcResiUserEntity;
+import com.epmet.entity.IcUserChangeRecordEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.redis.ChangeRelocationRedis;
 import com.epmet.service.*;
@@ -78,6 +84,10 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
     private IcUserTransferRecordService icUserTransferRecordService;
     @Resource
     private IcResiUserConfirmService icResiUserConfirmService;
+    @Autowired
+    private IcResiUserDao icResiUserDao;
+    @Autowired
+    private IcUserChangeRecordService icUserChangeRecordService;
 
     @Override
     public PageData<ChangeRelocationDTO> page(Map<String, Object> params) {
@@ -342,6 +352,36 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         }
     }
 
+    @Override
+    public void recovery(TokenDto tokenDto, OnlyIdFormDTO dto) {
+
+        // 更新用户基础信息用户状态信息
+        ChangeRelocationEntity changeRelocationEntity = baseDao.selectById(dto.getId());
+        IcResiUserEntity icResiUserEntity = icResiUserDao.selectById(changeRelocationEntity.getIcUserId());
+        icResiUserEntity.setStatus("0");
+        icResiUserEntity.setSubStatus("51");
+        icResiUserDao.updateById(icResiUserEntity);
+
+        // 添加迁出恢复记录
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();
+        changeRecordEntity.setCustomerId(tokenDto.getCustomerId());
+        changeRecordEntity.setOperatorId(tokenDto.getUserId());
+        changeRecordEntity.setIcUserId(icResiUserEntity.getId());
+        changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
+        changeRecordEntity.setIcUserName(icResiUserEntity.getName());
+        changeRecordEntity.setType("recovery_moveout");
+        changeRecordEntity.setTypeName("恢复迁出");
+        changeRecordEntity.setBeforeChangeName("-");
+        changeRecordEntity.setAfterChangeName("-");
+        changeRecordEntity.setChangeTime(new java.util.Date());
+        icUserChangeRecordService.insert(changeRecordEntity);
+
+        // 清除迁出表数据
+        baseDao.deleteById(dto.getId());
+
+    }
+
     public void editResiMq(String customerId, String userId) {
         //推送MQ事件
         IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();

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

@@ -39,6 +39,7 @@
         SELECT
         r.id,
         u.`NAME`,
+        u.STATUS,
         r.ID_CARD,
         u.GENDER,
         r.age,