|
|
|
@@ -185,6 +185,9 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
}else if (record.getPhysicsType() == EnumEnergyMeterPhysicsType.PUBLIC.getCode() || record.getPhysicsType() == EnumEnergyMeterPhysicsType.SUMMARY.getCode()) { |
|
|
|
List<Long> floorIds = record.getFloorIds(); |
|
|
|
List<Long> buildindIds = record.getBuildingIds(); |
|
|
|
if (null == floorIds || floorIds.size() <= 0 || null == buildindIds || buildindIds.size() <= 0 ) { |
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"必须选择楼层和楼座"); |
|
|
|
} |
|
|
|
FloorBuildingIdDTO dto = getFloorBuildingIds(record, floorIds, buildindIds); |
|
|
|
record.setType(dto.getType().getCode()); |
|
|
|
aliasIds = dto.getIds(); |
|
|
|
@@ -906,6 +909,9 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
Map<Long,WxShop> shopMap = wxShopService.findShopMap(shopq); |
|
|
|
for (int i = 0 ; i < record.getMeterReadingList().size(); i ++) { |
|
|
|
WxEnergyMeterReading r = record.getMeterReadingList().get(i); |
|
|
|
if (StringUtils.isBlank(r.getCurNumber())) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
//获取上一次的数据 |
|
|
|
WxEnergyMeterReading pre = findPre(r); |
|
|
|
if (null != pre) { |
|
|
|
|