Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport

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) {

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);
 }

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);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java

@@ -30,4 +30,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IcUserTransferRecordDao extends BaseDao<IcUserTransferRecordEntity> {
 
+    int deleteByIcResiUserId(String icResiUserId);
 }

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);
 }

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);
 }

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);
 }

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());
     }
 
     /**

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);
+    }
 }

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 按客户初始化客户下居民的变更记录、变更明细数据

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

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>

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>

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>