diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index cbf21ab0c..174871d4b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/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 shopIdList = new ArrayList(); + for (int i = 0 ; i < sss.length ; i ++) { + shopIdList.add(Long.parseLong(sss[i])); + } + record.setShopIds(shopIdList); + } + } wxEnergyService.exportFeesShop(record, request, response); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java index 3667414be..923ec46bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java @@ -123,9 +123,11 @@ public class WxEnergyFeesShop extends TenantEntity { @TableField(exist = false) private List shopIds; - + @TableField(exist = false) + private String shopIdsStr; @TableField(exist = false) private String feesIdsStr; + @TableField(exist = false) private List feesIds; public Date calcuteEndTime() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java index eb6a71f02..b6c9875f6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java +++ b/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; }