diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java index cce4515441..6fa0ed8051 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java @@ -160,12 +160,21 @@ public class IcResiUserServiceImpl implements IcResiUserService { resultMap.put("GRID_ID",gridInfoMap.get(resultMap.get("GRID_ID")).getGridName()); } if(null !=houseInfoMap &&houseInfoMap.containsKey(resultMap.get("HOME_ID"))){ + String homeId=resultMap.get("HOME_ID").toString(); + resultMap.put("HOME_ID_VALUE",homeId); + String buildName=houseInfoMap.get(resultMap.get("HOME_ID")).getBuildingName(); resultMap.put("BUILD_NAME",buildName); + String neighBorName=houseInfoMap.get(resultMap.get("HOME_ID")).getNeighborHoodName(); resultMap.put("VILLAGE_NAME",neighBorName); + String unitName=houseInfoMap.get(resultMap.get("HOME_ID")).getUnitName(); resultMap.put("UNIT_NAME",unitName); + + String doorName=houseInfoMap.get(resultMap.get("HOME_ID")).getDoorName(); + resultMap.put("DOOR_NAME",doorName); + String houseType=houseInfoMap.get(resultMap.get("HOME_ID")).getHouseType(); //房屋类型,1楼房,2平房,3别墅 resultMap.put("HOUSE_TYPE",""); @@ -176,9 +185,8 @@ public class IcResiUserServiceImpl implements IcResiUserService { }else if("3".equals(houseType)){ resultMap.put("HOUSE_TYPE","别墅"); } - String doorName=houseInfoMap.get(resultMap.get("HOME_ID")).getDoorName(); - resultMap.put("DOOR_NAME",doorName); - resultMap.put("HOME_NAME",neighBorName.concat(buildName).concat(unitName).concat(doorName)); + + resultMap.put("HOME_ID",neighBorName.concat(buildName).concat(unitName).concat(doorName)); } if(resultMap.containsKey("GENDER")){ String genderValue=resultMap.get("GENDER").toString(); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java index d81dceafbc..64bbd8f661 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java @@ -122,9 +122,9 @@ public class IcFormItemServiceImpl extends BaseServiceImpl