|
|
@@ -361,6 +361,11 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
// record.setStartTime(time.getStartTime()); |
|
|
// record.setStartTime(time.getStartTime()); |
|
|
// record.setEndTime(time.getEndTime()); |
|
|
// record.setEndTime(time.getEndTime()); |
|
|
WxEnergyMeter meter = this.getMeterById(record, record.getMeterId()); |
|
|
WxEnergyMeter meter = this.getMeterById(record, record.getMeterId()); |
|
|
|
|
|
|
|
|
|
|
|
if (time.getType().intValue() != meter.getType().intValue()) { |
|
|
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"选择的表类型和区间不匹配"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// record.setMeterType(meter.getType()); |
|
|
// record.setMeterType(meter.getType()); |
|
|
// record.setMeterName(meter.getName()); |
|
|
// record.setMeterName(meter.getName()); |
|
|
// record.setMeterRate(meter.getRate()); |
|
|
// record.setMeterRate(meter.getRate()); |
|
|
@@ -460,7 +465,31 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
@Override |
|
|
@Override |
|
|
public PageInfo<WxEnergyReadingCalcute> readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, |
|
|
public PageInfo<WxEnergyReadingCalcute> readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, |
|
|
Integer pageSize) { |
|
|
Integer pageSize) { |
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyReadingCalcuteMapper.findList(record)); |
|
|
|
|
|
|
|
|
PageInfo<WxEnergyReadingCalcute> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyReadingCalcuteMapper.findList(record)); |
|
|
|
|
|
if (null != page && null != page.getList()) { |
|
|
|
|
|
WxEnergyFeesTime tq = new WxEnergyFeesTime(); |
|
|
|
|
|
tq.updateTenantInfo(record); |
|
|
|
|
|
Map<Long, WxEnergyFeesTime> timeMap = this.getTimeMap(tq); |
|
|
|
|
|
WxEnergyFees fq = new WxEnergyFees(); |
|
|
|
|
|
fq.updateTenantInfo(record); |
|
|
|
|
|
Map<Long, WxEnergyFees> fessMap = this.getFeesMap(fq); |
|
|
|
|
|
for (int i = 0 ; i < page.getList().size(); i++) { |
|
|
|
|
|
WxEnergyReadingCalcute c = page.getList().get(i); |
|
|
|
|
|
if (null != timeMap) { |
|
|
|
|
|
WxEnergyFeesTime time = timeMap.get(c.getTimeId()); |
|
|
|
|
|
if (null != time) { |
|
|
|
|
|
c.setTimeName(time.getName()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
if (null != fessMap) { |
|
|
|
|
|
WxEnergyFees fees = fessMap.get(c.getFeesId()); |
|
|
|
|
|
if (null != fees) { |
|
|
|
|
|
c.setFeesName(fees.getName()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
return page; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
|