winter 1 год назад
Родитель
Сommit
51dd42dadd
2 измененных файлов: 35 добавлений и 1 удалений
  1. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java
  2. +30
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java

+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumYesOrNo; import com.iformall.enums.EnumYesOrNo;
@@ -49,9 +50,13 @@ public class WxEnergyReadingCalcute extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="区间ID",name="timeId") @io.swagger.annotations.ApiModelProperty(value="区间ID",name="timeId")
private Long timeId; private Long timeId;
@TableField(exist = false)
private String timeName;
@io.swagger.annotations.ApiModelProperty(value="科目ID",name="feesId") @io.swagger.annotations.ApiModelProperty(value="科目ID",name="feesId")
private Long feesId; private Long feesId;
@TableField(exist = false)
private String feesName;
@io.swagger.annotations.ApiModelProperty(value = "isImported", name = "isImported") @io.swagger.annotations.ApiModelProperty(value = "isImported", name = "isImported")
private Integer isImported; private Integer isImported;


+ 30
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java Просмотреть файл

@@ -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


Загрузка…
Отмена
Сохранить