winter пре 1 година
родитељ
комит
4f851e0fad
2 измењених фајлова са 23 додато и 6 уклоњено
  1. +15
    -5
      mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java
  2. +8
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java

+ 15
- 5
mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java Прегледај датотеку

@@ -45,7 +45,7 @@ public class WxEnergyHelper {
@Autowired @Autowired
WxMallFloorService wxMallFloorService; 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>>(); List<Map<String,String>> retList = new ArrayList<Map<String,String>>();
@@ -59,14 +59,24 @@ public class WxEnergyHelper {
if (null != floorList && floorList.size() > 0 ) { if (null != floorList && floorList.size() > 0 ) {
for (int j = 0 ; j < floorList.size(); j++ ) { for (int j = 0 ; j < floorList.size(); j++ ) {
WxMallFloor floor = floorList.get(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, "商场总计租面积", "{#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; return retList;
} }
@@ -79,7 +89,7 @@ public class WxEnergyHelper {
public Map<String,String> generateMeterComponent(WxEnergyMeter meter) { public Map<String,String> generateMeterComponent(WxEnergyMeter meter) {
Map<String,String> m = new HashMap<String,String>(); 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()+"#}"); m.put("value", "{#meter_"+meter.getId()+"#}");
return m; return m;
} }


+ 8
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java Прегледај датотеку

@@ -732,7 +732,14 @@ public class WxEnergyServiceImpl implements WxEnergyService {
@Override @Override
public List<Map<String,String>> getFeesShopComponentList(WxEnergyFeesShop record) { public List<Map<String,String>> getFeesShopComponentList(WxEnergyFeesShop record) {
List<Map<String,String>> 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<Map<String,String>> retList = wxEnergyHelper.generateCalcuteComponent(record,shop);
//公共表,公摊总表,当前楼栋面积,当前楼层面积,总面积,店铺公摊系数 //公共表,公摊总表,当前楼栋面积,当前楼层面积,总面积,店铺公摊系数
WxEnergyMeter mq = new WxEnergyMeter(); WxEnergyMeter mq = new WxEnergyMeter();
mq.updateTenantInfo(record); mq.updateTenantInfo(record);


Loading…
Откажи
Сачувај