|
|
|
@@ -317,10 +317,15 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
} |
|
|
|
Map<Long, String> buildingMap = wxMallBuildingService.getBuildingMap(record); |
|
|
|
Map<Long, String> floorMap = wxMallFloorService.getFloorMap(record); |
|
|
|
WxShop sq = new WxShop(); |
|
|
|
sq.updateTenantInfo(record); |
|
|
|
sq.setIds(shopIdList); |
|
|
|
Map<Long, WxShop> shopMap = wxShopService.findShopMap(sq); |
|
|
|
|
|
|
|
Map<Long, WxShop> shopMap = null; |
|
|
|
if (shopIdList.size() > 0 ) { |
|
|
|
WxShop sq = new WxShop(); |
|
|
|
sq.updateTenantInfo(record); |
|
|
|
sq.setIds(shopIdList); |
|
|
|
wxShopService.findShopMap(sq); |
|
|
|
} |
|
|
|
|
|
|
|
Map<Long,String> meterAliasMap = new HashMap<Long,String>(); |
|
|
|
for (int i = 0 ; i < sflist.size(); i++) { |
|
|
|
WxEnergyMeterShopFloor sf = sflist.get(i); |
|
|
|
|