家庭成员迁出

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

@@ -2,6 +2,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.MaskResponse;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.enums.HomeMemberOperationEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -156,6 +157,7 @@ public class MyHomeController {
      * @author LZN
      * @date 2022/6/10 11:06
      */
+    @NoRepeatSubmit
     @PostMapping("moveOutMember")
     public Result moveOutMember(@RequestBody MoveOutMemberFormDTO form, @LoginUser TokenDto tokenDto) {
         form.setCustomerId(tokenDto.getCustomerId());

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

@@ -220,12 +220,21 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
      */
     @Override
     public void moveOutMember(MoveOutMemberFormDTO form) {
-        form = icResiUserDao.moveOutMember(form.getIcResiUserId(), form.getCustomerId());
-        form.setSurname(form.getAllName().substring(0, 1));
-        form.setName(form.getAllName().substring(1));
-        if (icResiUserConfirmDao.selectByIdCard(form.getIdCard(), form.getCustomerId(), form.getSubmitType()) > 0) {
-            icResiUserConfirmDao.deleteByIdCard(form.getIdCard(), form.getCustomerId(), form.getSubmitType());
+        MoveOutMemberFormDTO userInfo = icResiUserDao.moveOutMember(form.getIcResiUserId(), form.getCustomerId());
+        if (null == userInfo) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民已迁出", "居民已迁出");
         }
+        form.setName(userInfo.getAllName());
+        form.setAgencyId(userInfo.getAgencyId());
+        form.setPids(userInfo.getPids());
+        form.setHouseId(userInfo.getHouseId());
+        form.setGender(userInfo.getGender());
+        form.setIdCard(userInfo.getIdCard());
+        form.setBirthday(userInfo.getBirthday());
+        form.setHjszd(userInfo.getHjszd());
+        form.setXjzd(userInfo.getXjzd());
+        form.setMz(userInfo.getMz());
+        form.setYhzgx(userInfo.getYhzgx());
         IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(form, IcResiUserConfirmEntity.class);
         icResiUserConfirmDao.insert(entity);
     }

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

@@ -1108,7 +1108,7 @@
         SELECT
             AGENCY_ID,
             PIDS,
-            HOME_ID,
+            HOME_ID AS houseId,
             NAME as allName,
             MOBILE,
             GENDER,
@@ -1123,6 +1123,7 @@
         WHERE
             id = #{icResiUserId}
             AND customer_id = #{customerId}
+            AND STATUS = '0'
             AND DEL_FLAG = '0'
     </select>
     <select id="selectResiUserEntityByIdCard" resultType="com.epmet.entity.IcResiUserEntity">