历史数据导出

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

@@ -81,25 +81,29 @@ public class ReportExcelUtil {
      * @Param [list]
      * @return java.util.List<java.util.List<java.lang.String>>
      **/
-    public static List<List<String>> toHisoryDataReportExcelDto(List<ReportDto> list, int titleType){
+    public static List<List<String>> toHisoryDataReportExcelDto(List<ReportDto> list, int titleType) {
         int number = 1;
         List<List<String>> result = new ArrayList<>();
-        if (CollectionUtil.isEmpty(list)){
+        if (CollectionUtil.isEmpty(list)) {
             return result;
         }
         for (ReportDto reportDto : list) {
-            List<String>  dataList = new ArrayList<>();
-            dataList.add((number++) +"");
-            dataList.add(reportDto.getParentSceneName());
+            List<String> dataList = new ArrayList<>();
+            dataList.add((number++) + "");
+            if (titleType == 4) {
+                dataList.add(reportDto.getDeviceName());
+            } else {
+                dataList.add(reportDto.getParentSceneName());
+            }
             dataList.add(reportDto.getCollectDate());
-            List<Map<String,Object>> childList = reportDto.getDataMapValues();
+            List<Map<String, Object>> childList = reportDto.getDataMapValues();
             if (CollectionUtil.isEmpty(childList)) {
                 continue;
             }
-            for (Map<String,Object> childMap: childList) {
+            for (Map<String, Object> childMap : childList) {
                 int ok = 0;
-                for (Map.Entry<String,Object> entry : childMap.entrySet()) {
-                    if (ok == 0){
+                for (Map.Entry<String, Object> entry : childMap.entrySet()) {
+                    if (ok == 0) {
                         ok++;
                         continue;
                     }