历史数据导出

sms_water/src/main/java/com/huaxu/controller/DayMonthYearReportController.java

@@ -292,7 +292,7 @@ public class DayMonthYearReportController {
         if (CollectionUtil.isEmpty(list)) {
             return new AjaxMessage<>(ResultStatus.OK);
         }
-        List<List<String>> reportTitle = ReportExcelUtil.toExcelTitleList(list.get(0).getReportTitle(), 4,1);
+        List<List<String>> reportTitle = ReportExcelUtil.toExcelTitleList(list.get(0).getReportTitle(), queryDto.getSceneType(),1);
         String filePath = ExcelUtil.writeSimpleExcelWithHeader(baseDir, SceneEnum.getMsg(queryDto.getSceneType()) + "报表", reportTitle, ReportExcelUtil.toHisoryDataReportExcelDto(list, queryDto.getSceneType()));
         return new AjaxMessage<>(ResultStatus.OK, filePath);
     }

sms_water/src/main/java/com/huaxu/util/ReportExcelUtil.java

@@ -90,7 +90,7 @@ public class ReportExcelUtil {
         for (ReportDto reportDto : list) {
             List<String> dataList = new ArrayList<>();
             dataList.add((number++) + "");
-            if (titleType == 4) {
+            if (titleType==4) {
                 dataList.add(reportDto.getDeviceName());
             } else {
                 dataList.add(reportDto.getParentSceneName());