diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 91a33a123..933362739 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 91a33a123cf5d86c1bd84d9e23e14ad8e4545b45 +Subproject commit 9333627393ca5101c24221718ee54c603829c4c9 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 db24020fe..09b16f6bb 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 @@ -688,7 +688,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem dto.setId(formDto.getItemId()); dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice()); dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); + sendItemToDsf(dto, itemHandleProcessEntity); + //发送事件到市中心 try { sendCaseLaw(itemEntity); @@ -1824,6 +1826,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //上报到网格化平台 sendItemToDsf(dto, handleProcessEntity); } + //居民端项目关闭、结案-短信通知 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { @@ -2206,7 +2209,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem successFlag = YesOrNoEnum.YES.value(); } this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue(), - ApiConstants.sendEventUrl, successFlag, JSONObject.toJSONString(sendEventFormDto), + ApiConstants.sendEventUrl, successFlag, JSONObject.toJSONString(sendEventFormDto), sendResult.toString()); log.info("处理项目-上报网格化平台-存储日志结束"); return sendResult; @@ -3785,7 +3788,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @date 2022/9/5 14:37 * @params [dto] */ - @Transactional(rollbackFor = Exception.class) public void sendItemToDsf(ItemHandleSubmitFormDTO dto, ItemHandleProcessEntity process) { ItemGridPlatformEntity gridEntity = this.getReport(dto.getId()); if (null != gridEntity) { @@ -3794,9 +3796,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem try { reDoResult = this.eventsRejectDo(dto, gridEntity.getTaskid()); } catch (Exception e) { + itemHandleProcessDao.deleteById(process.getId()); throw new RenException("上报驳回重办失败:" + reDoResult.getMessage()); } if (!"0".equals(reDoResult.getCode())) { + itemHandleProcessDao.deleteById(process.getId()); // 接口没有返回信息,也没有异常信息 throw new RenException("上报驳回重办失败:" + reDoResult.getMessage()); } @@ -3808,10 +3812,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem try { sendResult = this.reportCaseNew(dto); } catch (Exception e) { + itemHandleProcessDao.deleteById(process.getId()); log.error("上报网格化平台接口失败:" + e.getMessage()); throw new RenException("上报网格化平台接口失败:" + sendResult.getMessage()); } if (!"0".equals(sendResult.getCode())) { + itemHandleProcessDao.deleteById(process.getId()); // 接口没有返回信息,也没有异常信息 throw new RenException("上报网格化平台接口失败:" + sendResult.getMessage()); }