Browse Source

1、空调机房分页界面有问题;

dev_fgd_scr
3067418132@qq.com 1 week ago
parent
commit
ce96e42669
  1. 1
      mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyAnalyzeServiceImpl.java
  2. 4
      mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyQueryServiceImpl.java

1
mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyAnalyzeServiceImpl.java

@ -245,6 +245,7 @@ public class EnergyAnalyzeServiceImpl implements EnergyAnalyzeService {
map.put("timeStr", timeStr.subList(startIndex, endIndex)); map.put("timeStr", timeStr.subList(startIndex, endIndex));
map.put("dataList", columnData); map.put("dataList", columnData);
} }
map.put("total", timeStr.size());
return new ArrayList<>(map.entrySet()); return new ArrayList<>(map.entrySet());
} }

4
mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyQueryServiceImpl.java

@ -262,6 +262,7 @@ public class EnergyQueryServiceImpl implements IEnergyQueryService {
map.put("copArr", Arrays.copyOfRange(copArr, startIndex, endIndex)); map.put("copArr", Arrays.copyOfRange(copArr, startIndex, endIndex));
map.put("timeStrArr", Arrays.copyOfRange(timeStrArr, startIndex, endIndex)); map.put("timeStrArr", Arrays.copyOfRange(timeStrArr, startIndex, endIndex));
} }
map.put("total", timeStrArr.length);
// 组装赋值 // 组装赋值
List<Map<String, Object>> listData = new ArrayList<>(); List<Map<String, Object>> listData = new ArrayList<>();
@ -281,6 +282,9 @@ public class EnergyQueryServiceImpl implements IEnergyQueryService {
Map<String, Object> timeStr = new HashMap<>(); Map<String, Object> timeStr = new HashMap<>();
timeStr.put("timeStrArr", map.get("timeStrArr")); timeStr.put("timeStrArr", map.get("timeStrArr"));
listData.add(timeStr); listData.add(timeStr);
Map<String, Object> total = new HashMap<>();
total.put("total", map.get("total"));
listData.add(total);
return AjaxResult.success(listData); return AjaxResult.success(listData);
} }

Loading…
Cancel
Save