联建单位、社会自组织删除时增加判断是否同步到通讯录 是否有未办结项目

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@@ -41,10 +41,12 @@ import com.epmet.dto.result.*;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcCommunitySelfOrganizationEntity;
 import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity;
+import com.epmet.entity.IcPartyUnitEntity;
 import com.epmet.excel.CommunitySelfOrgImportExcel;
 import com.epmet.excel.ImportCommunitySelfOrganization;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcCommunitySelfOrganizationPersonnelService;
 import com.epmet.service.IcCommunitySelfOrganizationService;
@@ -66,6 +68,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
@@ -97,6 +100,8 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
+    @Resource
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
     @Override
     public PageData<IcCommunitySelfOrganizationDTO> page(Map<String, Object> params) {
@@ -374,8 +379,29 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         if (icUserDemandRecDao.selectCountByServerId(formDTO.getOrgId()) > NumConstant.ZERO) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未完成的服务", "存在未完成的服务，不能删除");
         }
-        baseDao.deleteById(formDTO.getOrgId());
+        //校验是否有同步到通讯录，是否存在工作人员下有未处理项目数据【社会自组织被同步到通讯录部门的，如果部门下人员存在未办结项目则不允许删除】
-        personnelService.deleteByOrgId(formDTO.getOrgId());
+        boolean bl = true;
+        IcCommunitySelfOrganizationEntity entity = baseDao.selectById(formDTO.getOrgId());
+        if (null != entity && "sync".equals(entity.getSyncType())) {
+            CheckStaffInfoFormDTO dto = new CheckStaffInfoFormDTO();
+            dto.setId(formDTO.getOrgId());
+            dto.setDeptId(entity.getDeptId());
+            dto.setDeptType("community_org");
+            dto.setDeptStaffId(entity.getDeptStaffId());
+            Result<CheckStaffInfoResultDTO> result = govOrgOpenFeignClient.notSyncDept(dto);
+            if (!result.success()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "社会自组织删除，取消同步到通讯录数据失败", "社会自组织删除，取消同步到通讯录数据失败");
+            }
+            if (!result.getData().getType()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), result.getData().getMsg(), result.getData().getMsg());
+            }
+            bl = result.getData().getType();
+        }
+        if (bl) {
+            baseDao.deleteById(formDTO.getOrgId());
+            personnelService.deleteByOrgId(formDTO.getOrgId());
+        }
+
     }
 
     /**

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -59,10 +59,7 @@ import com.epmet.entity.IcCommunitySelfOrganizationEntity;
 import com.epmet.entity.IcPartyUnitEntity;
 import com.epmet.excel.IcPartyUnitImportExcel;
 import com.epmet.excel.IcPartyUnitImportFailedExcel;
-import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.feign.*;
-import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
-import com.epmet.feign.EpmetHeartOpenFeignClient;
-import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcCommunitySelfOrganizationService;
 import com.epmet.service.IcPartyUnitService;
 import com.epmet.service.IcServiceItemDictService;
@@ -80,6 +77,7 @@ import org.apache.http.entity.ContentType;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
@@ -115,6 +113,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
     private EpmetHeartOpenFeignClient heartOpenFeignClient;
     @Resource
     private IcCommunitySelfOrganizationService icCommunitySelfOrganizationService;
+    @Resource
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
     @Override
     public PageData<IcPartyUnitDTO> search(PartyUnitFormDTO formDTO) {
@@ -261,8 +261,28 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         if (icUserDemandRecService.selectCountByServerId(id) > NumConstant.ZERO) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未完成的服务", "存在未完成的服务，不能删除");
         }
-        // 逻辑删除（@TableLogic 注解）
+        //校验是否有同步到通讯录，是否存在工作人员下有未处理项目数据【联建单位被同步到通讯录部门的，如果部门下人员存在未办结项目则不允许删除】
-        baseDao.deleteById(id);
+        boolean bl = true;
+        IcPartyUnitEntity entity = baseDao.selectById(id);
+        if (null != entity && "sync".equals(entity.getSyncType())) {
+            CheckStaffInfoFormDTO dto = new CheckStaffInfoFormDTO();
+            dto.setId(id);
+            dto.setDeptId(entity.getDeptId());
+            dto.setDeptType("party_unit");
+            dto.setDeptStaffId(entity.getDeptStaffId());
+            Result<CheckStaffInfoResultDTO> result = govOrgOpenFeignClient.notSyncDept(dto);
+            if (!result.success()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "联建单位删除，取消同步到通讯录数据失败", "联建单位删除，取消同步到通讯录数据失败");
+            }
+            if (!result.getData().getType()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), result.getData().getMsg(), result.getData().getMsg());
+            }
+        }
+        if (bl) {
+            // 逻辑删除（@TableLogic 注解）
+            baseDao.deleteById(id);
+        }
+
     }
 
     /**

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -705,4 +705,7 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/ichouse/getOwnerHouseList")
     Result<List<HouseInfoDTO>> getOwnerHouseList(@RequestBody IcHouseDTO formDTO);
+
+    @PostMapping("/gov/org/department/notsyncdept")
+    Result<CheckStaffInfoResultDTO> notSyncDept(@RequestBody CheckStaffInfoFormDTO formDTO);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -459,4 +459,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getOwnerHouseList", formDTO);
     }
 
+    @Override
+    public Result<CheckStaffInfoResultDTO> notSyncDept(CheckStaffInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "notSyncDept", formDTO);
+    }
+
 }