项目详情提交逻辑更改

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<ItemDao, ItemEntity> 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("请选择正确的处理部门");
                     }