diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 92b36afe3..8a9d89fb5 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -903,26 +903,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 上报网格化平台(社区吹哨) } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { log.info("处理项目-进入上报网格化平台(社区吹哨)"); - boolean reportFlag = this.checkReport(dto.getId()); - if (reportFlag) { - return new Result().error("当前项目已上报网格化平台"); - } handleProcessEntity.setState(dto.getHandleCategory()); informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT); - SendEventResultDto sendResult = null; - try { - sendResult = this.reportCaseNew(dto); - } catch (Exception e) { - return new Result().error("上报网格化平台接口失败" + e.getMessage()); - } - if (null == sendResult || !("0").equals(sendResult.getCode())) { - // 接口没有返回信息,也没有异常信息 - return new Result().error("上报网格化平台接口失败" + sendResult.getMessage()); - } // 记录处理记录 itemHandleProcessService.insert(handleProcessEntity); - // 记录平台上报信息 - this.saveItemGridPlatformInfo(sendResult, handleProcessEntity); + //上报到网格化平台 + sendItemToDsf(dto,handleProcessEntity); log.info("处理项目-上报网格化平台-if结束"); // 结案申请 } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { @@ -960,6 +946,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemDeptService.modifyItemDepts(dto.getHandlerDeptId(), dto.getId()); // 记录处理记录 itemHandleProcessService.insert(handleProcessEntity); + //上报到网格化平台 + sendItemToDsf(dto,handleProcessEntity); // 新增流转协助部门 itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId()); List newDeptIds = new ArrayList<>();