winter 1 год назад
Родитель
Сommit
983c6f7168
3 измененных файлов: 26 добавлений и 2 удалений
  1. +10
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java
  3. +13
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java

+ 10
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java Просмотреть файл

@@ -472,6 +472,16 @@ public class WxEnergyController extends BaseController {
record.setFeesIds(feesIdList);
}
}
if (StringUtils.isNotBlank(record.getShopIdsStr())) {
String[] sss = record.getShopIdsStr().split(",");
if (null != sss && sss.length > 0 ) {
List<Long> shopIdList = new ArrayList<Long>();
for (int i = 0 ; i < sss.length ; i ++) {
shopIdList.add(Long.parseLong(sss[i]));
}
record.setShopIds(shopIdList);
}
}
wxEnergyService.exportFeesShop(record, request, response);
}


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

@@ -123,9 +123,11 @@ public class WxEnergyFeesShop extends TenantEntity {
@TableField(exist = false)
private List<Long> shopIds;

@TableField(exist = false)
private String shopIdsStr;
@TableField(exist = false)
private String feesIdsStr;
@TableField(exist = false)
private List<Long> feesIds;
public Date calcuteEndTime() {


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

@@ -157,6 +157,8 @@ public class WxEnergyMeterReading extends TenantEntity {
excelTitle.put("preTime", "上次抄表时间");
excelTitle.put("preByName", "上次抄表人");
excelTitle.put("curNumber", "本次抄表数");
excelTitle.put("usage", "用量");
excelTitle.put("meterRate", "表倍率");
return excelTitle;
}
@@ -172,8 +174,18 @@ public class WxEnergyMeterReading extends TenantEntity {
excelObject.put("meterType", this.getMeterTypeName());
excelObject.put("preNumber", this.getPreNumber());
excelObject.put("preTime", DateUtils.formatDateTime(this.getPreTime()));
excelObject.put("preTime", this.getPreByName());
excelObject.put("preByName", this.getPreByName());
excelObject.put("curNumber", this.getCurNumber());
String preNumber = this.getPreNumber();
if (StringUtils.isBlank(preNumber)) {
preNumber = "0";
}
String curNumber = this.getCurNumber();
if (StringUtils.isBlank(curNumber)) {
curNumber = "0";
}
excelObject.put("usage", new BigDecimal(curNumber).subtract(new BigDecimal(preNumber)).toPlainString());
excelObject.put("meterRate", this.getMeterRate());
return excelObject;
}


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