From f5f2bf8d81a06c7c4bb9ff2fb92d61a463f953d2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 17 Aug 2022 17:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/IcResiUserController.java     | 6 ++++++
 .../main/java/com/epmet/dao/IcUserChangeDetailedDao.java    | 2 ++
 .../src/main/java/com/epmet/dao/IcUserChangeRecordDao.java  | 2 ++
 .../main/java/com/epmet/dao/IcUserTransferRecordDao.java    | 3 ++-
 .../java/com/epmet/service/IcUserChangeDetailedService.java | 2 ++
 .../java/com/epmet/service/IcUserChangeRecordService.java   | 2 ++
 .../java/com/epmet/service/IcUserTransferRecordService.java | 2 ++
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java  | 4 ++++
 .../epmet/service/impl/IcUserChangeDetailedServiceImpl.java | 5 +++++
 .../epmet/service/impl/IcUserChangeRecordServiceImpl.java   | 5 +++++
 .../epmet/service/impl/IcUserTransferRecordServiceImpl.java | 5 +++++
 .../src/main/resources/mapper/IcUserChangeDetailedDao.xml   | 4 ++++
 .../src/main/resources/mapper/IcUserChangeRecordDao.xml     | 5 +++++
 .../src/main/resources/mapper/IcUserTransferRecordDao.xml   | 5 ++++-
 14 files changed, 50 insertions(+), 2 deletions(-)

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 e3e68fdbb9..40e661a63b 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
@@ -190,6 +190,12 @@ public class IcResiUserController implements ResultDataResolver {
         IC_RESI_DOWNLOAD_DIR = exportDir;
     }
 
+    /**
+     * 批量删除居民信息
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
     @NoRepeatSubmit
     @PostMapping("delete")
     public Result delete(@LoginUser TokenDto tokenDto, @RequestBody DelIcResiUserFormDTO formDTO) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java
index ecb3d1f561..bee24287c5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java
@@ -39,4 +39,6 @@ public interface IcUserChangeDetailedDao extends BaseDao<IcUserChangeDetailedEnt
      * @Description 删除客户是新增类型的变更明细历史数据
      **/
     void delByCustomerId(@Param("customerId") String customerId, @Param("type") String type, @Param("icUserIds") List<String> icUserIds);
+
+    int deleteByIcResiUserId(String icResiUserId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java
index cff359168c..89ee1327f2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java
@@ -49,4 +49,6 @@ public interface IcUserChangeRecordDao extends BaseDao<IcUserChangeRecordEntity>
      * @Description 删除客户是新增类型的变更历史数据
      **/
     void delByCustomerId(@Param("customerId") String customerId, @Param("type") String type, @Param("icUserIds") List<String> icUserIds);
+
+    int deleteByIcResiUserId(String icResiUserId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java
index dacd67bd6c..a869491b26 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java
@@ -29,5 +29,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcUserTransferRecordDao extends BaseDao<IcUserTransferRecordEntity> {
-	
+
+    int deleteByIcResiUserId(String icResiUserId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java
index ce2747ddcd..cf305c4b0a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java
@@ -36,4 +36,6 @@ public interface IcUserChangeDetailedService extends BaseService<IcUserChangeDet
      * @Description 删除客户是新增类型的变更明细历史数据
      **/
     void delByCustomerId(String customerId, String type, List<String> icUserIds);
+
+    int deleteByIcResiUserId(String icResiUserId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java
index a75d3a1fe1..fa68cd34da 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java
@@ -54,4 +54,6 @@ public interface IcUserChangeRecordService extends BaseService<IcUserChangeRecor
      * @Description 历史居民数据生成变更记录和变更明细数据
      **/
     void icUserChangeRecordInit(IcUserChangeRecordInitFormDTO formDTO) throws ParseException;
+
+    int deleteByIcResiUserId(String icResiUserId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
index 4fe9bdfddf..c9dfefc7d9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
@@ -47,4 +47,6 @@ public interface IcUserTransferRecordService extends BaseService<IcUserTransferR
      * @param formDTO
      */
     void moveResi(IcResiUserTransferFormDTO formDTO);
+
+    int deleteByIcResiUserId(String icResiUserId);
 }
\ No newline at end of file
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 7b34dca592..acd4e69ef5 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
@@ -184,6 +184,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 baseDao.updateSubTableToDel(subTalbeName, formDTO.getIcResiUserId());
             }
         }
+        //删除ic_user_transfer_record、ic_user_change_record、ic_user_change_detailed
+        icUserTransferRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId());
+        icUserChangeRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId());
+        icUserChangeDetailedService.deleteByIcResiUserId(formDTO.getIcResiUserId());
     }
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java
index dbdb593d7a..7cf719e48d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java
@@ -43,4 +43,9 @@ public class IcUserChangeDetailedServiceImpl extends BaseServiceImpl<IcUserChang
     public void delByCustomerId(String customerId, String type, List<String> icUserIds) {
         baseDao.delByCustomerId(customerId, type, icUserIds);
     }
+
+    @Override
+    public int deleteByIcResiUserId(String icResiUserId) {
+        return baseDao.deleteByIcResiUserId(icResiUserId);
+    }
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
index f72d695c5e..4120e5c2a6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
@@ -171,6 +171,11 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
         }
     }
 
+    @Override
+    public int deleteByIcResiUserId(String icResiUserId) {
+        return baseDao.deleteByIcResiUserId(icResiUserId);
+    }
+
     /**
      * @Author sun
      * @Description 按客户初始化客户下居民的变更记录、变更明细数据
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
index 2428c39fda..102c7e6150 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
@@ -411,6 +411,11 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         icUserChangeDetailedService.insertBatch(changeDetailedEntityList);
     }
 
+    @Override
+    public int deleteByIcResiUserId(String icResiUserId) {
+        return baseDao.deleteByIcResiUserId(icResiUserId);
+    }
+
 
     /**
      * 根据userId查询ic_resi_user
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml
index 0931d47836..6edda514fe 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml
@@ -15,4 +15,8 @@
         </foreach>
     </delete>
 
+    <update id="deleteByIcResiUserId" parameterType="java.lang.String">
+        update ic_user_change_detailed set del_flag='1'
+        where  IC_USER_ID=#{icResiUserId}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml
index cd04e8ddfa..cc865efc81 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml
@@ -73,4 +73,9 @@
         </foreach>
     </delete>
 
+    <update id="deleteByIcResiUserId" parameterType="java.lang.String">
+        update ic_user_change_record set del_flag='1'
+        where IC_USER_ID = #{icResiUserId}
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml
index be24ced9be..d2a829567e 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml
@@ -3,5 +3,8 @@
 
 <mapper namespace="com.epmet.dao.IcUserTransferRecordDao">
 
-
+    <update id="deleteByIcResiUserId" parameterType="java.lang.String">
+        update ic_user_transfer_record set del_flag='1'
+        where IC_USER_ID = #{icResiUserId}
+    </update>
 </mapper>
\ No newline at end of file