From f83ee0bb4615747b95687ee62512f6bac7f6f8e3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 5 Nov 2021 13:31:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95=E8=A2=AB?=
 =?UTF-8?q?=E5=88=A0=EF=BC=8C=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/IcResiUserController.java  |  9 +++++++++
 .../java/com/epmet/service/IcResiUserService.java   |  8 ++++++++
 .../epmet/service/impl/IcResiUserServiceImpl.java   | 13 +++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 7030248522..dd62a9fd02 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -69,6 +69,15 @@ public class IcResiUserController {
     @Autowired
     private IcResiUserImportService icResiUserImportService;
 
+    @PostMapping("delete")
+    public Result delete(@LoginUser TokenDto tokenDto,@RequestBody DelIcResiUserFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,DelIcResiUserFormDTO.IdGroup.class);
+        icResiUserService.delete(formDTO);
+        return new Result();
+    }
+
+
     /**
      * @Author sun
      * @Description 党建互联平台--保存居民信息
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
index ea67a9b872..db49d560d5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
@@ -34,6 +34,14 @@ import java.util.Map;
  * @since v1.0.0 2021-10-26
  */
 public interface IcResiUserService extends BaseService<IcResiUserEntity> {
+    /**
+     * 单个删除
+     *
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void delete(DelIcResiUserFormDTO formDTO);
 
     /**
      * @Author sun
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 33db29fba4..edec6e3d51 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -90,6 +90,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return wrapper;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(DelIcResiUserFormDTO formDTO) {
+        baseDao.updateToDel(formDTO.getIcResiUserId());
+        CustomerFormQueryDTO queryDTO = ConvertUtils.sourceToTarget(formDTO, CustomerFormQueryDTO.class);
+        Result<Set<String>> subTableRes = operCustomizeOpenFeignClient.queryIcResiSubTables(queryDTO);
+        if (subTableRes.success() && !CollectionUtils.isEmpty(subTableRes.getData())) {
+            for (String subTalbeName : subTableRes.getData()) {
+                baseDao.updateSubTableToDel(subTalbeName, formDTO.getIcResiUserId());
+            }
+        }
+    }
+
     /**
      * @Author sun
      * @Description 党建互联平台--保存居民信息