From 2a7319be2809dbb5808f07688f2d9fe681546546 Mon Sep 17 00:00:00 2001 From: HAHA <1824278510@qq.com> Date: Thu, 22 Sep 2022 14:15:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=B3=E5=9B=9E/=E7=BB=93?= =?UTF-8?q?=E6=A1=88=E9=80=BB=E8=BE=91=E6=8F=92=E5=85=A5=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 e888acafc..bc42cc09a 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 @@ -3199,9 +3199,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemEntity item = baseDao.selectById(itemPlat.getReferenceId()); log.info("根据id查询数据"); itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); - // 诉求结案,上报市平台 - pushToCityGridService.caseClosedSentoCity(itemHandleProcessDto.getId()); - log.info("诉求结案,上报市平台"); //判断最后一条处理进展是吹哨还是结案,结案:取第一条处置意见;吹哨:取平台处置意见 if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag())){ //执法和发展填写网格化平台的意见 @@ -3219,9 +3216,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem }else if("1".equals(formDto.getState())){ itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue()); itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()); - // 上报驳回,上报市平台 - log.info("上报驳回,上报市平台" + itemHandleProcessDto.getId()); - pushToCityGridService.ReportRejection(itemHandleProcessDto.getId()); }else{ // 保存接口调用日志 this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), @@ -3233,6 +3227,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setCreatedTime(new Date()); itemHandleProcessDto.setUpdatedTime(new Date()); itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto); + if("1".equals(formDto.getState())){ + // 上报驳回,上报市平台 + log.info("上报驳回,上报市平台" + itemHandleProcessDto.getId()); + pushToCityGridService.ReportRejection(itemHandleProcessDto.getId()); + } else if("0".equals(formDto.getState())) { + // 诉求结案,上报市平台 + pushToCityGridService.caseClosedSentoCity(itemHandleProcessDto.getId()); + log.info("诉求结案,上报市平台"); + } //项目处理意见图片保存 if (formDto.getImages() != null && formDto.getImages().size() > 0) { imgService.saveImages(formDto.getImages(), itemHandleProcessDto.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE);