Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
@@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.nio.file.Path;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -159,7 +161,16 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl<Communi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(List<String> ids) {
-        baseDao.deleteBatchIds(ids);
+        Date now=new Date();
+        ids.forEach(id->{
+            LambdaUpdateWrapper<CommunityBuildingManagerEntity> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(CommunityBuildingManagerEntity::getId, id)
+                    .set(CommunityBuildingManagerEntity::getDelFlag, NumConstant.ONE_STR)
+                    .set(CommunityBuildingManagerEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId())
+                    .set(CommunityBuildingManagerEntity::getUpdatedTime, now);
+            baseDao.update(null, updateWrapper);
+            // todo
+        });
     }
 
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java

@@ -183,27 +183,21 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String id) {
-        CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId());
-        // 查询当前物业，在本组织及下级范围内，管理的小区
-        List<IcNeighborHoodDTO> originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(id, staffInfoCacheResult.getAgencyId());
-        // 如果存在记录，则解除物业与小区关联关系
-        originNeighborHoodList.forEach(origin -> {
-            LambdaUpdateWrapper<IcNeighborHoodPropertyEntity> updateWrapper1 = new LambdaUpdateWrapper<>();
-            updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId, id)
-                    .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, origin.getId())
-                    .set(IcNeighborHoodPropertyEntity::getDelFlag, NumConstant.ONE_STR)
-                    .set(IcNeighborHoodPropertyEntity::getUpdatedTime, new Date())
-                    .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId());
-            icNeighborHoodPropertyDao.update(null, updateWrapper1);
-        });
-        // 再查询是否存在其他组织下的小区，与该物业有关联，存在则不允许删除
-        LambdaQueryWrapper<IcNeighborHoodPropertyEntity> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id);
-        if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前物业已与其他组织下的小区关联，无法删除", "当前物业已与其他组织下的小区关联，无法删除");
-        }
+        Date now = new Date();
+        // 删除物业与小区关联关系表
+        LambdaUpdateWrapper<IcNeighborHoodPropertyEntity> updateWrapper1 = new LambdaUpdateWrapper<>();
+        updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId, id)
+                .set(IcNeighborHoodPropertyEntity::getDelFlag, NumConstant.ONE_STR)
+                .set(IcNeighborHoodPropertyEntity::getUpdatedTime, now)
+                .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId());
+        icNeighborHoodPropertyDao.update(null, updateWrapper1);
         // 删除物业表
-        icPropertyManagementDao.deleteById(id);
+        LambdaUpdateWrapper<IcPropertyManagementEntity> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(IcPropertyManagementEntity::getId, id)
+                .set(IcPropertyManagementEntity::getDelFlag, NumConstant.ONE_STR)
+                .set(IcPropertyManagementEntity::getUpdatedTime, now)
+                .set(IcPropertyManagementEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId());
+        icPropertyManagementDao.update(null, updateWrapper);
     }