| @@ -341,18 +341,18 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| if (null != shopMap ) { | if (null != shopMap ) { | ||||
| WxShop shop = shopMap.get(sf.getAliseId()); | WxShop shop = shopMap.get(sf.getAliseId()); | ||||
| if (null != shop) { | if (null != shop) { | ||||
| sf.setAliseName(shop.getShopNumber()); | |||||
| sf.setAliseName("["+EnumEnergyMeterShopFloorType.SHOP.getMessage()+"]"+shop.getShopNumber()); | |||||
| } | } | ||||
| } | } | ||||
| }else if (sf.getType() == EnumEnergyMeterShopFloorType.BUILDING.getCode()) { | }else if (sf.getType() == EnumEnergyMeterShopFloorType.BUILDING.getCode()) { | ||||
| if (null != buildingMap ) { | if (null != buildingMap ) { | ||||
| String build = buildingMap.get(sf.getAliseId()); | String build = buildingMap.get(sf.getAliseId()); | ||||
| sf.setAliseName(build); | |||||
| sf.setAliseName("["+EnumEnergyMeterShopFloorType.BUILDING.getMessage()+"]"+build); | |||||
| } | } | ||||
| }else if (sf.getType() == EnumEnergyMeterShopFloorType.FLOOR.getCode()) { | }else if (sf.getType() == EnumEnergyMeterShopFloorType.FLOOR.getCode()) { | ||||
| if (null != floorMap ) { | if (null != floorMap ) { | ||||
| String floor = floorMap.get(sf.getAliseId()); | String floor = floorMap.get(sf.getAliseId()); | ||||
| sf.setAliseName(floor); | |||||
| sf.setAliseName("["+EnumEnergyMeterShopFloorType.FLOOR.getMessage()+"]"+floor); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||