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 a48754efe..90ebd5782 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java @@ -129,8 +129,8 @@ public class WxEnergyMeterReading extends TenantEntity { public static Map generateExcelTitle() { Map excelTitle = new LinkedHashMap(); - excelTitle.put("calcuteId", "批次编码"); - excelTitle.put("id", "编码"); + excelTitle.put("calcuteId", "编码"); + excelTitle.put("id", "抄表数据编码"); excelTitle.put("timeId", "时间区间"); excelTitle.put("startTime", "开始日期"); excelTitle.put("endTime", "截止日期"); 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 9b8435367..517b0e491 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -745,7 +745,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { String[] needFields = new String[excelTitle.size()]; int index = 0; for (Iterator it = excelTitle.keySet().iterator(); it.hasNext();) { - String fi = it.next(); + String fi = excelTitle.get(it.next()); needFields[index] = fi; index = index + 1; }