diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java index 383964016..a0174c754 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumYesOrNo; @@ -49,9 +50,13 @@ public class WxEnergyReadingCalcute extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="区间ID",name="timeId") private Long timeId; + @TableField(exist = false) + private String timeName; @io.swagger.annotations.ApiModelProperty(value="科目ID",name="feesId") private Long feesId; + @TableField(exist = false) + private String feesName; @io.swagger.annotations.ApiModelProperty(value = "isImported", name = "isImported") private Integer isImported; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 24a5a8488..ca7f2bba7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -361,6 +361,11 @@ public class WxEnergyServiceImpl implements WxEnergyService { // record.setStartTime(time.getStartTime()); // record.setEndTime(time.getEndTime()); 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.setMeterName(meter.getName()); // record.setMeterRate(meter.getRate()); @@ -460,7 +465,31 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Override public PageInfo readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyReadingCalcuteMapper.findList(record)); + PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyReadingCalcuteMapper.findList(record)); + if (null != page && null != page.getList()) { + WxEnergyFeesTime tq = new WxEnergyFeesTime(); + tq.updateTenantInfo(record); + Map timeMap = this.getTimeMap(tq); + WxEnergyFees fq = new WxEnergyFees(); + fq.updateTenantInfo(record); + Map 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