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