From 8de301fd7b124e7261ba1e34d185ee3aaf749c67 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 18 May 2020 11:19:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=90=B9=E5=93=A8=E6=93=8D=E4=BD=9C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=A1=97=E9=81=93=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 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 ecbd0b8a6..b16552d00 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 @@ -623,6 +623,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { + // 吹哨 + Result result = adminFeignClient.getCompleteDept(entity.getGridId()); + String streetId = ""; + if( result.getCode() == 0){ + CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO)result.getData(); + streetId = completeDeptDTO.getStreetId() == null ? "" : completeDeptDTO.getStreetId().toString(); + }else{ + throw new RenException(result.getMsg()); + } + if (!dto.getHandlerDeptId().equals(entity.getGridId()) || !dto.getHandlerDeptId().equals(streetId)) { + return new Result().error("请选择正确的处理部门"); + } + // 项目流转校验 Result checkResult = this.checkItemCirculation(dto); if (!checkResult.success()) { @@ -674,8 +687,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem } else { handleProcessEntity.setState(dto.getHandleCategory()); // 更新项目状态 - if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || - ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { + if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { + if (!dto.getHandlerDeptId().equals(entity.getGridId())) { + return new Result().error("请选择正确的处理部门"); + } + informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_CLOSED); ItemEntity itemEntity = new ItemEntity();