diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptPlantformProcessDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptPlantformProcessDTO.java index 7dd4fef96..eb419c508 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptPlantformProcessDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptPlantformProcessDTO.java @@ -61,7 +61,7 @@ public class AcceptPlantformProcessDTO implements Serializable { /** * 网格化平台-单位编码 */ - private String cantoncode; + private String gridCantoncode; /** * */ 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 407477c12..9a51eb73f 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 @@ -3820,7 +3820,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridPartyname(formDto.getGridPartyname()); itemHandleProcessDto.setGridUnitid(formDto.getGridUnitid()); itemHandleProcessDto.setGridUnitname(formDto.getGridUnitname()); - itemHandleProcessDto.setGridCantoncode(formDto.getCantoncode()); + itemHandleProcessDto.setGridCantoncode(formDto.getGridCantoncode()); //根据网格化区域编码获取对应的市中心区域编码 if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) { Result result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode()); @@ -3982,7 +3982,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridPartyname(formDto.getGridPartyname()); itemHandleProcessDto.setGridUnitid(formDto.getGridUnitid()); itemHandleProcessDto.setGridUnitname(formDto.getGridUnitname()); - itemHandleProcessDto.setGridCantoncode(formDto.getCantoncode()); + itemHandleProcessDto.setGridCantoncode(formDto.getGridCantoncode()); //根据网格化区域编码获取对应的市中心区域编码 if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) { Result result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode()); @@ -4510,7 +4510,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem dto.setGridPartyname(hEntity.getGridPartyname()); dto.setGridUnitid(hEntity.getGridUnitid()); dto.setGridUnitname(hEntity.getGridUnitname()); - dto.setCantoncode(hEntity.getGridCantoncode()); + dto.setGridCantoncode(hEntity.getGridCantoncode()); dto.setImages(imgUrlList); dto.setCreatedTime(hEntity.getCreatedTime()); processDTO = closedItem(dto); @@ -4667,7 +4667,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem dto.setGridPartyname(hEntity.getGridPartyname()); dto.setGridUnitid(hEntity.getGridUnitid()); dto.setGridUnitname(hEntity.getGridUnitname()); - dto.setCantoncode(hEntity.getGridCantoncode()); + dto.setGridCantoncode(hEntity.getGridCantoncode()); dto.setImages(formDTO.getHandleImages()); dto.setCreatedTime(new Date()); closedItem(dto); @@ -4817,7 +4817,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridPartyname(formDto.getGridPartyname()); itemHandleProcessDto.setGridUnitid(formDto.getGridUnitid()); itemHandleProcessDto.setGridUnitname(formDto.getGridUnitname()); - itemHandleProcessDto.setGridCantoncode(formDto.getCantoncode()); + itemHandleProcessDto.setGridCantoncode(formDto.getGridCantoncode()); //根据网格化区域编码获取对应的市中心区域编码 if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) { Result result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode());