Merge remote-tracking branch 'origin/develop' into release_temp

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 党建互联平台--保存居民信息

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

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 党建互联平台--保存居民信息