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 20edd0527..c445fa072 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 @@ -4520,8 +4520,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem dto.setDeptResultDTOS(deptList); itemDeptService.saveItemDepts(deptId, dto, handleProcessEntity.getId()); - //上报市平台 - pushToCityGridService.earlyInspection(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); } else { //不同意,上报网格化平台 //变为不可评价 @@ -4535,6 +4533,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem dto.setHandlerDept(dept.getData().getName()); reReport(dto); } + //上报市平台 + pushToCityGridService.earlyInspection(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); // 更新项目最后一次处理时间 ItemEntity itemEntity = new ItemEntity(); @@ -4581,8 +4581,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem //同意,结案 handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_AGREE.getValue()); itemHandleProcessService.insert(handleProcessEntity); - //上报市平台 - pushToCityGridService.endInspection(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); LambdaQueryWrapper hWrapper = new LambdaQueryWrapper<>(); hWrapper.eq(ItemHandleProcessEntity::getItemId, formDTO.getId()); @@ -4609,8 +4607,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem //不同意,返回初验 handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_UN_AGREE.getValue()); itemHandleProcessService.insert(handleProcessEntity); - } + + //上报市平台 + pushToCityGridService.endInspection(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); } /**