|
@@ -137,7 +137,7 @@ public class MeasurementSettlementRecordHander {
|
|
|
Integer clearingPeriod = measurementSettlement.getBillingCycle();
|
|
|
Date clearingEndDate = getClearingEndDate(clearingDate);
|
|
|
Date clearingStartDate = getClearingStartDate(clearingEndDate,clearingPeriod);
|
|
|
- List<MeterReadRecordVo> recordList =meterReadRecordDao.querySettlementWaterConsumption(device, clearingStartDate, clearingEndDate);//
|
|
|
+ List<MeterReadRecordVo> recordList =meterReadRecordDao.querySettlementWaterConsumption(device.getId(), clearingStartDate, clearingEndDate);
|
|
|
|
|
|
// 3,获取结算周期内开始数据
|
|
|
MeterReadRecordDTO clearingStartMeterRecord = getClearingStartMeterRecord(device,clearingStartDate,lastClearingRecordItem,recordList);
|