修改逆变器年月报表分页

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java

@@ -206,6 +206,10 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         tdHYGFInverterMonthGeneratePage.setSize(size);
         tdHYGFInverterMonthGeneratePage.setCurrent(current);
         tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerates.stream().filter(tdHYGFInverterMonthGenerate -> StringUtils.isNotBlank(tdHYGFInverterMonthGenerate.getSnCode().trim())).collect(Collectors.toList());
+        int total = tdHYGFInverterMonthGenerates.size();
+        if (total  < (current * size)){
+            current = 1;
+        }
         tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerates.subList((current - 1) * size, current * size > tdHYGFInverterMonthGenerates.size() ? tdHYGFInverterMonthGenerates.size() : current * size);
         tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour()))));
         tdHYGFInverterMonthGeneratePage.setRecords(tdHYGFInverterMonthGenerates);
@@ -240,6 +244,10 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         tdHYGFInverterYearGeneratePage.setSize(size);
         tdHYGFInverterYearGeneratePage.setCurrent(current);
         tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerates.stream().filter(tdHYGFInverterYearGenerate -> StringUtils.isNotBlank(tdHYGFInverterYearGenerate.getSnCode().trim())).collect(Collectors.toList());
+        int total = tdHYGFInverterYearGenerates.size();
+        if (total  < (current * size)){
+            current = 1;
+        }
         tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerates.subList((current - 1) * size, current * size > tdHYGFInverterYearGenerates.size() ? tdHYGFInverterYearGenerates.size() : current * size);
         tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setFullhour(Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour()))));
         tdHYGFInverterYearGeneratePage.setRecords(tdHYGFInverterYearGenerates);