diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingToCityResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingToCityResultDTO.java index 1ffa870bf..c47469ad0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingToCityResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingToCityResultDTO.java @@ -111,6 +111,8 @@ public class AppealHandlingToCityResultDTO implements Serializable { */ private long handlerDeptId; + private String disCenterZoningCode; + /** * 操作人部门 */ 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 9a51eb73f..84624f7da 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 @@ -1622,6 +1622,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); + // 诉求审核,上报市平台 + pushToCityGridService.appealAudit(handleProcessEntity.getId()); log.info("处理项目-结案申请-if结束"); } else { handleProcessEntity.setState(dto.getHandleCategory()); @@ -2945,6 +2947,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 网格化平台,处置完成 if (ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue() == dto.getState()) { pushToCityGridService.appealHandling(dto); + // 诉求审核,上报市平台 + pushToCityGridService.appealAudit(dto.getId()); } } @@ -4892,8 +4896,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem message = message + ":" + formDto; this.saveInterfaceLog(formDto.getItemId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), ApiConstants.acceptItemProcess, successFlag, message, returnMsgBody); - // 诉求审核,上报市平台 - pushToCityGridService.appealAudit(itemHandleProcessDto.getId()); //诉求结案 pushToCityGridService.caseClosedSentoCity(itemHandleProcessDto.getId()); return itemHandleProcessDto; 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 4f62aee63..7ce3c8640 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 @@ -701,21 +701,26 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { dto.setXm(item.getGridPartyname()); // 操作人员唯一标识 dto.setId(item.getGridPartyid()); + dto.setSsjgbm(item.getDisCenterZoningCode()); + dto.setSsjg(item.getGridUnitname()); + dto.setSsbmbm(item.getGridUnitid()); + dto.setSsbm(item.getGridUnitname()); } else { // 操作人姓名 dto.setXm(null == SecurityUser.getUser() ? "" : SecurityUser.getUser().getUsername()); // 操作人员唯一标识 dto.setId(item.getCreatedBy()); + // 所属机构id + dto.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR)); + // 所属机构名称 + dto.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ONE_STR)); + // 所属部门id + dto.setSsbmbm(String.valueOf(item.getHandlerDeptId())); + // 所属部门名称 + dto.setSsbm(item.getHandlerDept()); } - // 所属机构id - dto.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR)); - // 所属机构名称 - dto.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ONE_STR)); - // 所属部门id - dto.setSsbmbm(String.valueOf(item.getHandlerDeptId())); - // 所属部门名称 - dto.setSsbm(item.getHandlerDept()); + // 组装完成,推送 data.setCzr(dto); String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.HANDLE, "诉求处理"); @@ -1229,15 +1234,32 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { dto.setDqclhj(CityPushLinkEnum.KSLDSH.getCode()); dto.setCzbs(getItemCzbs(entity.getGridCantoncode())); dto.setCzjg(NumConstant.ONE_STR); - dto.setCzsj(DateUtils.format(DateUtils.addDateMinutes(entity.getCreatedTime(), (int)(Math.random()*10 + 10)), DateUtils.DATE_TIME_PATTERN)); + dto.setCzsj(DateUtils.format(DateUtils.addDateMinutes(entity.getCreatedTime(), (int)(Math.random()*10 + 3)), DateUtils.DATE_TIME_PATTERN)); dto.setCzyj(entity.getHandleAdvice()); AppealAuditResultDTO.CzrDTO czr = new AppealAuditResultDTO.CzrDTO(); - czr.setId(entity.getGridPartyid()); - czr.setXm(entity.getGridPartyname()); - czr.setSsjgbm(entity.getDisCenterZoningCode()); - czr.setSsjg(entity.getGridUnitname()); - czr.setSsbmbm(entity.getGridUnitid()); - czr.setSsbm(entity.getGridUnitname()); + if ("网格化平台".equals(entity.getCreatedBy())) { + // 操作人姓名 + czr.setId(entity.getGridPartyid()); + // 操作人员唯一标识 + czr.setXm(entity.getGridPartyname()); + czr.setSsjgbm(entity.getDisCenterZoningCode()); + czr.setSsjg(entity.getGridUnitname()); + czr.setSsbmbm(entity.getGridUnitid()); + czr.setSsbm(entity.getGridUnitname()); + } else { + // 操作人姓名 + czr.setXm(null == SecurityUser.getUser() ? "" : SecurityUser.getUser().getUsername()); + // 操作人员唯一标识 + czr.setId(entity.getCreatedBy()); + // 所属机构id + czr.setSsjgbm(getJgbm(entity.getHandlerDeptId(), NumConstant.ZERO_STR)); + // 所属机构名称 + czr.setSsjg(getJgbm(entity.getHandlerDeptId(), NumConstant.ONE_STR)); + // 所属部门id + czr.setSsbmbm(String.valueOf(entity.getHandlerDeptId())); + // 所属部门名称 + czr.setSsbm(entity.getHandlerDept()); + } dto.setCzr(czr); // 组装好直接推送 String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_AUDIT, "诉求审核");