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 7be4e8bfb..483775870 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 @@ -446,10 +446,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 诉求id data.setSqid(getSqid(item.getItemId())); - // 诉求状态(未知) - data.setSqzt(CityPushStateEnum.DCL.getCode()); - // 当前处理环节(未知) - data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode()); + // 上报时间 data.setCzsj(item.getCreatedTime()); // 上报原因 @@ -457,7 +454,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 操作人 AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO(); - if(source.equals(NumConstant.ONE_STR)) { + if(source.equals(NumConstant.ONE_STR)) { // 0是自己平台 + // 诉求状态(未知) + data.setSqzt(CityPushStateEnum.DCL.getCode()); + // 当前处理环节(未知) + data.setDqclhj(CityPushLinkEnum.ZJYP.getCode()); + // 操作人姓名 dto.setXm(item.getGridPartyname()); // 操作人员唯一标识 @@ -479,10 +481,15 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { dto.setSsjgbm(adminFeignClient.getCompleteDept(item.getHandlerDeptId()).toString()); } } - } else { + } else { // 1是网格化 dto.setXm(item.getCreatedBy()); dto.setSsbmbm(item.getHandlerDeptId()+""); dto.setSsbm(item.getHandlerDept()); + + // 诉求状态(未知) + data.setSqzt(CityPushStateEnum.DPQ.getCode()); + // 当前处理环节(未知) + data.setDqclhj(CityPushLinkEnum.QZXYP.getCode()); } // 组装完成,推送 @@ -517,7 +524,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 诉求状态(未知) data.setSqzt(CityPushStateEnum.DCL.getCode()); // 当前处理环节(未知) - data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode()); + data.setDqclhj(CityPushLinkEnum.ZJYP.getCode()); // 驳回时间 data.setCzsj(item.getCreatedTime()); // 驳回原因