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 6e50e622f..9699b55da 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 @@ -1557,6 +1557,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem //社区吹哨，上报市平台 pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR); + // 删除已流转协助部门 + itemDeptService.modifyItemDepts(dto.getHandlerDeptId(), dto.getId()); + // 新增流转协助部门 + itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId()); log.info("社区吹哨-上报市平台-结束"); // 结案申请 } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { @@ -1826,8 +1830,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem this.workProjectHandle(dto); if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { - // 诉求处理，上报市平台 - pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); + Result resultdept = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); + SysDeptDTO dept = resultdept.getData(); + if (!OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dept.getTypeKey())) { + // 诉求处理，上报市平台 + pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); + } // 诉求审核，上报市平台 //itemAutoProcessRedis.produce(handleProcessEntity.getId().concat(":3"), System.currentTimeMillis() + (131 * 1000)); //ItemHandleProcessDTO d = ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class); @@ -4508,12 +4516,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem closed(id); } else if (NumConstant.THREE_STR.equals(type)) { //诉求审核 - ItemHandleProcessEntity processEntity = itemHandleProcessDao.selectById(id); - if (ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue() == processEntity.getState()) { - pushToCityGridService.appealAudit(id, NumConstant.ZERO_STR); - } else { - pushToCityGridService.appealAudit(id, NumConstant.ONE_STR); - } + ItemHandleProcessDTO dto = new ItemHandleProcessDTO(); + dto.setId(id); + pushToCityGridService.earlyInspectionApply(dto); } else if (NumConstant.FOUR_STR.equals(type)) { //派遣审核 ItemHandleProcessEntity processEntity = itemHandleProcessDao.selectById(id); @@ -4619,7 +4624,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem pushToCityGridService.evaluation(itemId); //3-2.只有首次评价的判断是发展、执法诉求的(这两个诉求项目必须走诉求初验终验逻辑)或者是评价了不满意的民生诉求的需要走市里的初验申请 - if (CollUtil.isEmpty(feedbackEntityList) && (!"0".equals(entity.getPeopleFlag()) || (null != entity.getEvaluationScore() && entity.getEvaluationScore() == 0))) { + if ((CollUtil.isEmpty(feedbackEntityList) && (!"0".equals(entity.getPeopleFlag())) || (null != entity.getEvaluationScore() && entity.getEvaluationScore() == 0))) { //logger.info("当前诉求不做结案处理，原因：诉求分类PeopleFlag->" + entity.getPeopleFlag() + ",诉求状态itemState->" + entity.getItemState()); ItemHandleProcessEntity processEntity = new ItemHandleProcessEntity(); processEntity.setId(UUID.randomUUID().toString().replace("-", "")); @@ -4639,9 +4644,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem processEntity.setHandlerDept(name); itemHandleProcessService.insert(processEntity); //初验申请 - ItemHandleProcessDTO dto = new ItemHandleProcessDTO(); - dto.setId(processEntity.getId()); - pushToCityGridService.earlyInspectionApply(dto); + itemAutoProcessRedis.produce(processEntity.getId().concat(":3"), System.currentTimeMillis() + (131 * 1000)); return; } else { //3-3.已经推了评价接口，下一个流程指定是结案的项目，将其二次放入缓存，待131秒后走结案 @@ -4706,7 +4709,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem deptList.add(itemCirculationDeptResultDTO); dto.setDeptResultDTOS(deptList); itemDeptService.saveItemDepts(deptId, dto, handleProcessEntity.getId()); - + pushToCityGridService.earlyInspection(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); } else { //不同意，上报网格化平台 //变为不可评价 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index 940ef6bc8..d644d4b2c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -492,6 +492,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 操作人 AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO(); if (source.equals(NumConstant.ZERO_STR)) { // 0是自己平台 + UserDetail user = SecurityUser.getByUser(Long.valueOf(item.getCreatedBy())); // 诉求状态 data.setSqzt(CityPushStateEnum.DCL.getCode()); // 当前处理环节 @@ -499,7 +500,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { //处置标识 data.setCzbs(getItemCzbs(item.getGridCantoncode())); - dto.setXm(SecurityUser.getUser().getUsername()); + dto.setXm(user.getUsername()); // 操作人员唯一标识 dto.setId(item.getCreatedBy());