Merge branch 'feature/dev_sunjiatan_moveout' into master_shibei

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

@@ -210,4 +210,6 @@ public class ChangeRelocationDTO implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date transferTime;
+
+    private String isMoveOut;
 }

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

@@ -221,4 +221,6 @@ public class IcResiUserConfirmDTO implements Serializable {
 
     private String moveOutDate;
 
+    private String isMoveOut;
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ConfirmListResultDTO.java

@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 @Data
 public class ConfirmListResultDTO {
     private String id;
+    private String agencyId;
     private String name;
     private String gender;
     private String mobile;

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

@@ -124,4 +124,24 @@ public class ChangeRelocationController {
         return new Result();
     }
 
+    /**
+     * 从家庭中移除
+     *
+     * @Param tokenDto
+     * @Param dto
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/6/27 10:50
+     */
+    @NoRepeatSubmit
+    @PostMapping("moveOutHomeConfirm")
+    public Result moveOutHomeConfirm(@LoginUser TokenDto tokenDto, @RequestBody ChangeRelocationDTO dto){
+        dto.setCustomerId(tokenDto.getCustomerId());
+        dto.setStaffId(tokenDto.getUserId());
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        changeRelocationService.moveOutHomeConfirm(dto);
+        return new Result();
+    }
+
 }

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

@@ -95,4 +95,14 @@ public interface ChangeRelocationService extends BaseService<ChangeRelocationEnt
      * @Date 2022/6/27 10:52
      */
     void moveOutHome(ChangeRelocationDTO dto);
+
+    /**
+     * 从家庭中移除
+     *
+     * @Param dto
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/6/27 10:52
+     */
+    void moveOutHomeConfirm(ChangeRelocationDTO dto);
 }

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

@@ -10,6 +10,8 @@ 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.bean.HouseInfoCache;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -32,10 +34,7 @@ import com.epmet.entity.ChangeRelocationEntity;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.redis.ChangeRelocationRedis;
-import com.epmet.service.ChangeRelocationService;
-import com.epmet.service.ChangeWelfareService;
-import com.epmet.service.IcResiUserService;
-import com.epmet.service.IcUserTransferRecordService;
+import com.epmet.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -76,6 +76,8 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
     private IcResiUserService icResiUserService;
     @Resource
     private IcUserTransferRecordService icUserTransferRecordService;
+    @Resource
+    private IcResiUserConfirmService icResiUserConfirmService;
 
     @Override
     public PageData<ChangeRelocationDTO> page(Map<String, Object> params) {
@@ -279,6 +281,67 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         }
     }
 
+    /**
+     * 从家庭中移除
+     *
+     * @param dto
+     * @Param dto
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/6/27 10:52
+     */
+    @Override
+    public void moveOutHomeConfirm(ChangeRelocationDTO dto) {
+        if (NumConstant.ONE_STR.equals(dto.getIsMoveOut())) {
+            //需要迁至其他房屋，走变更流程
+            //获取居民信息
+            IcResiUserDTO userInfo = icResiUserService.get(dto.getIcUserId());
+            if (null == userInfo) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民信息不存在", "居民信息不存在");
+            }
+            //组织内走变更流程
+            IcResiUserTransferFormDTO formDTO = new IcResiUserTransferFormDTO();
+            formDTO.setIcUserId(dto.getIcUserId());
+            formDTO.setType("in");
+            formDTO.setNewAgencyId(userInfo.getAgencyId());
+            formDTO.setNewGridId(dto.getGridId());
+            formDTO.setNewNeighborHoodId(dto.getVillageId());
+            formDTO.setNewBuildingId(dto.getBuildId());
+            formDTO.setNewBuildingUnitId(dto.getUnitId());
+            formDTO.setNewHouseId(dto.getHomeId());
+            formDTO.setTransferTime(dto.getTransferTime());
+            formDTO.setIdEdit(false);
+            formDTO.setCustomerId(dto.getCustomerId());
+            formDTO.setStaffId(dto.getStaffId());
+            icUserTransferRecordService.add(formDTO);
+            //更改房屋
+            IcResiUserEntity uerEntity = new IcResiUserEntity();
+            uerEntity.setId(dto.getIcUserId());
+            uerEntity.setGridId(dto.getGridId());
+            uerEntity.setVillageId(dto.getVillageId());
+            uerEntity.setBuildId(dto.getBuildId());
+            uerEntity.setUnitId(dto.getUnitId());
+            uerEntity.setHomeId(dto.getHomeId());
+            icResiUserService.updateById(uerEntity);
+        } else {
+            //不需要迁至其他房屋，直接变游离状态
+            IcResiUserEntity userEntity = icResiUserService.selectById(dto.getIcUserId());
+            //获取房屋信息
+            HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(dto.getCustomerId(), userEntity.getHomeId());
+            if (null == houseInfo) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
+            }
+            dto.setOldDept(houseInfo.getGridName());
+            dto.setOldAddress(houseInfo.getAllName());
+            dto.setOldHome(houseInfo.getDoorName());
+            dto.setType("out");
+            dto.setOutOfTime(new Date());
+            dto.setAddress("其他");
+            dto.setReason("移除");
+            this.saveOutOfInfo(dto);
+        }
+    }
+
     public void editResiMq(String customerId, String userId) {
         //推送MQ事件
         IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();

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

@@ -167,11 +167,13 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
         if (null != result) {
             LambdaQueryWrapper<IcResiUserConfirmEntity> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(IcResiUserConfirmEntity::getIcResiUserId, dto.getIcResiUserId());
+            wrapper.eq(IcResiUserConfirmEntity::getHouseId, result.getHouseId());
             wrapper.in(IcResiUserConfirmEntity::getSubmitType, Arrays.asList("in", "out"));
             wrapper.orderByDesc(IcResiUserConfirmEntity::getCreatedTime);
             List<IcResiUserConfirmEntity> list = baseDao.selectList(wrapper);
             if (CollectionUtils.isNotEmpty(list)) {
-                result.setMoveOutStatus(list.get(NumConstant.ZERO).getConfirmResult());
+                result.setMoveOutStatus(NumConstant.ONE_STR.equals(list.get(NumConstant.ZERO).getConfirmResult())?
+                        NumConstant.THREE_STR:list.get(NumConstant.ZERO).getConfirmResult());
             } else {
                 result.setMoveOutStatus(NumConstant.THREE_STR);
             }
@@ -341,6 +343,7 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "驳回原因不能为空", "驳回原因不能为空");
             }
         }
+        formDTO.setOperationDescribe(formDTO.getIsMoveOut());
         baseDao.updateById(ConvertUtils.sourceToTarget(formDTO, IcResiUserConfirmEntity.class));
         //审核不通过，发送消息
         if (NumConstant.TWO_STR.equals(formDTO.getConfirmResult())) {

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

@@ -62,6 +62,7 @@
     <select id="getConfirmList" resultType="com.epmet.dto.result.ConfirmListResultDTO">
         SELECT
             a.ID,
+            a.AGENCY_ID,
             b.`NAME`,
             b.GENDER,
             b.ID_CARD,
@@ -81,7 +82,7 @@
         WHERE
             a.DEL_FLAG = 0
             AND a.SUBMIT_TYPE IN ( 'in', 'out' )
-            AND a.AGENCY_ID = #{agencyId}
+            AND (a.AGENCY_ID = #{agencyId} OR a.PIDS LIKE concat( '%', #{agencyId}, '%' ))
             <if test="null != name and name.trim() != ''">
                 AND b.NAME LIKE CONCAT('%',#{name},'%')
             </if>

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

@@ -1132,9 +1132,11 @@
 			mz,
 			HJSZD,
 			yhzgx,
-			XJZD
+			XJZD,
+			HOME_ID AS houseId
     from ic_resi_user
     where DEL_FLAG='0'
+            and Status='0'
 		  and id=#{icResiUserId}
     </select>
     <select id="moveOutMember" resultType="com.epmet.dto.form.MoveOutMemberFormDTO">