|
|
|
@@ -1078,13 +1078,6 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//用户表 |
|
|
|
WxEnergyMeter mq = new WxEnergyMeter(); |
|
|
|
mq.updateTenantInfo(record); |
|
|
|
mq.setType(fees.getType()); |
|
|
|
mq.setPhysicsType(EnumEnergyMeterPhysicsType.USER.getCode()); |
|
|
|
mq.setHasFee(EnumYesOrNo.YES.getCode()); |
|
|
|
List<Long> meterList = wxEnergyMeterMapper.findIdList(mq); |
|
|
|
//查询公摊表 |
|
|
|
Map<Long,List<Long>> summaryMeterMap = null; |
|
|
|
if (fees.getIsPublic() == EnumYesOrNo.YES.getCode()) { |
|
|
|
@@ -1092,10 +1085,10 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
sumq.updateTenantInfo(record); |
|
|
|
sumq.setType(fees.getType()); |
|
|
|
sumq.setPhysicsType(EnumEnergyMeterPhysicsType.SUMMARY.getCode()); |
|
|
|
List<WxEnergyMeter> sumeterList = wxEnergyMeterMapper.findList(mq); |
|
|
|
List<WxEnergyMeter> sumeterList = wxEnergyMeterMapper.findList(sumq); |
|
|
|
if (null != sumeterList && sumeterList.size() > 0 ) { |
|
|
|
summaryMeterMap = new HashMap<Long,List<Long>>(); |
|
|
|
for (int i = 0 ; i < meterList.size(); i ++) { |
|
|
|
for (int i = 0 ; i < sumeterList.size(); i ++) { |
|
|
|
WxEnergyMeter summaryMeter = sumeterList.get(i); |
|
|
|
//查询总表下的子表 |
|
|
|
WxEnergyMeterChild mcq = new WxEnergyMeterChild(); |
|
|
|
@@ -1114,6 +1107,13 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
Long shopId= shopIds.get(i); |
|
|
|
WxShop shop = shopMap.get(shopId); |
|
|
|
|
|
|
|
//查询用户表 |
|
|
|
WxEnergyMeterShopFloor sfq = new WxEnergyMeterShopFloor(); |
|
|
|
sfq.updateTenantInfo(record); |
|
|
|
sfq.setType(EnumEnergyMeterShopFloorType.SHOP.getCode()); |
|
|
|
sfq.setAliseId(shopId); |
|
|
|
List<Long> meterList = wxEnergyMeterShopFloorMapper.findMeterIdList(sfq); |
|
|
|
|
|
|
|
//如果店铺已经存在了计算,则不允许重复 |
|
|
|
WxEnergyReadingCalcuteResult crq = new WxEnergyReadingCalcuteResult(); |
|
|
|
crq.updateTenantInfo(record); |
|
|
|
|