|
|
|
@@ -45,7 +45,7 @@ public class WxEnergyHelper { |
|
|
|
@Autowired |
|
|
|
WxMallFloorService wxMallFloorService; |
|
|
|
|
|
|
|
public List<Map<String,String>> generateCalcuteComponent(TenantEntity tenantEntity) { |
|
|
|
public List<Map<String,String>> generateCalcuteComponent(TenantEntity tenantEntity,WxShop shop) { |
|
|
|
//公共表,公摊总表,当前楼栋面积,当前楼层面积,总面积,店铺公摊系数 |
|
|
|
List<Map<String,String>> retList = new ArrayList<Map<String,String>>(); |
|
|
|
|
|
|
|
@@ -59,14 +59,24 @@ public class WxEnergyHelper { |
|
|
|
if (null != floorList && floorList.size() > 0 ) { |
|
|
|
for (int j = 0 ; j < floorList.size(); j++ ) { |
|
|
|
WxMallFloor floor = floorList.get(j); |
|
|
|
addComponent(retList, "楼层("+mb.getBuildingName()+floor.getFloorName()+")面积", "{#floorArea_"+floor.getId()+"#}"); |
|
|
|
BigDecimal area = floor.getOperatingArea(); |
|
|
|
if (null == area) { |
|
|
|
area = new BigDecimal(0); |
|
|
|
} |
|
|
|
addComponent(retList, "("+mb.getBuildingName()+floor.getFloorName()+")面积【"+area.toPlainString()+"㎡】", "{#floorArea_"+floor.getId()+"#}"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
addComponent(retList, "商场总计租面积", "{#totalArea#}"); |
|
|
|
addComponent(retList, "店铺公摊系数", "{#shopPublicRax#}"); |
|
|
|
addComponent(retList, "铺位面积", "{#shopArea#}"); |
|
|
|
if (null != shop ) { |
|
|
|
addComponent(retList, "店铺公摊系数【"+shop.getPulicRate()+"】", "{#shopPublicRax#}"); |
|
|
|
addComponent(retList, "铺位面积【"+shop.getRentArea()+"】", "{#shopArea#}"); |
|
|
|
}else { |
|
|
|
addComponent(retList, "店铺公摊系数", "{#shopPublicRax#}"); |
|
|
|
addComponent(retList, "铺位面积", "{#shopArea#}"); |
|
|
|
} |
|
|
|
|
|
|
|
return retList; |
|
|
|
} |
|
|
|
|
|
|
|
@@ -79,7 +89,7 @@ public class WxEnergyHelper { |
|
|
|
|
|
|
|
public Map<String,String> generateMeterComponent(WxEnergyMeter meter) { |
|
|
|
Map<String,String> m = new HashMap<String,String>(); |
|
|
|
m.put("name", meter.getName()); |
|
|
|
m.put("name", "【"+meter.getPhysicsTypeName()+"-"+meter.getTypeName()+"】"+meter.getName()); |
|
|
|
m.put("value", "{#meter_"+meter.getId()+"#}"); |
|
|
|
return m; |
|
|
|
} |
|
|
|
|