From 668d408afc1a594480184fee50db3e07d8dee343 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 5 Sep 2022 19:59:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 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 3d95fa8fa..7236b03a6 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 @@ -974,16 +974,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem log.info("处理项目-结案申请-if结束"); } else { handleProcessEntity.setState(dto.getHandleCategory()); -// if(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue() == dto.getHandleCategory()){ -// // 如果操作是【响应拟办】【直接办理】相当于之前逻辑的【回应】 -// handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); -// }else{ -// handleProcessEntity.setState(dto.getHandleCategory()); -// } + + Result result = adminFeignClient.getCompleteDept(entity.getGridId()); + Long communityId = 0L; + if( result.getCode() == 0){ + CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO)result.getData(); + communityId = completeDeptDTO.getCommunityId(); + }else{ + throw new RenException(result.getMsg()); + } // 更新项目状态 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { - if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue()) { + if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue() && dto.getHandlerDeptId().longValue() != communityId.longValue()) { return new Result().error("请选择正确的处理部门"); }