diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java index bc5f09014..cb4f24c0a 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java @@ -45,7 +45,7 @@ public class WxEnergyHelper { @Autowired WxMallFloorService wxMallFloorService; - public List> generateCalcuteComponent(TenantEntity tenantEntity) { + public List> generateCalcuteComponent(TenantEntity tenantEntity,WxShop shop) { //公共表,公摊总表,当前楼栋面积,当前楼层面积,总面积,店铺公摊系数 List> retList = new ArrayList>(); @@ -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 generateMeterComponent(WxEnergyMeter meter) { Map m = new HashMap(); - m.put("name", meter.getName()); + m.put("name", "【"+meter.getPhysicsTypeName()+"-"+meter.getTypeName()+"】"+meter.getName()); m.put("value", "{#meter_"+meter.getId()+"#}"); return m; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 05099db5a..f514632bb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -732,7 +732,14 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Override public List> getFeesShopComponentList(WxEnergyFeesShop record) { - List> retList = wxEnergyHelper.generateCalcuteComponent(record); + WxShop shop = null; + if (null != record.getId()) { + WxEnergyFeesShop data = wxEnergyFeesShopMapper.selectById(record.getId(),record.getTenantId()); + if (null != data) { + shop = wxShopService.getById(data.getShopId()); + } + } + List> retList = wxEnergyHelper.generateCalcuteComponent(record,shop); //公共表,公摊总表,当前楼栋面积,当前楼层面积,总面积,店铺公摊系数 WxEnergyMeter mq = new WxEnergyMeter(); mq.updateTenantInfo(record);