用能月报导出调整

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -603,8 +603,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
             ExportParams params = new ExportParams(null, "用能月报");
             workbook = ExcelExportUtil.exportBigExcel(params, HtAnalogDataTwoExportVo.class,
                     (o, i) -> {
-//                        int startCurrent = (i - 1) * 30;
-                        int startCurrent =0;
+                        int startCurrent = (i - 1) * 10000;
                         List<HtAnalogDataOneVo> listOne = this.monthlyReportlist(deviceCode, startTime, endTime, cycle, startCurrent);
                         return new ArrayList<>(BeanMapperUtils.mapList(listOne, HtAnalogDataOneVo.class, HtAnalogDataTwoExportVo.class));
                     }, null);
@@ -635,8 +634,8 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
     @Override
     public List<HtAnalogDataOneVo> monthlyReportlist(String deviceCode, String startTime, String endTime, int cycle, Integer startCurrent) {
         List<HtAnalogDataOneVo> listOne = new ArrayList<>();
-        List<HtAnalogDataOneVo> maxMonthlyReport = baseMapper.energyUseListOne(deviceCode, startTime, endTime, cycle, 1, null, startCurrent);
-        List<HtAnalogDataOneVo> minMonthlyReport = baseMapper.energyUseListOne(deviceCode, startTime, endTime, cycle, 2, null, startCurrent);
+        List<HtAnalogDataOneVo> maxMonthlyReport = baseMapper.energyUseListOne(deviceCode, startTime, endTime, cycle, 1, 10000, startCurrent);
+        List<HtAnalogDataOneVo> minMonthlyReport = baseMapper.energyUseListOne(deviceCode, startTime, endTime, cycle, 2, 10000, startCurrent);
         if (maxMonthlyReport.size() > 0) {
             Double epp=0.00;
             for (int j = 0; j < maxMonthlyReport.size()+1; j++) {