修改巡检报告题目及字段信息

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/export/ExportInspectionHandleReportService.java

@@ -87,7 +87,8 @@ public class ExportInspectionHandleReportService {
         }
 
         // 生成word
-        String areaName = this.getAreaName();
+        //String areaName = this.getAreaName();
+        String areaName = "江苏省泰州市海陵区";
         String titleName = areaName + "城管巡检处理报告";
         File f = new File(filePath);
         if (!f.exists() || f.length() < 1000) {
@@ -99,7 +100,8 @@ public class ExportInspectionHandleReportService {
         }
 
         // 下载
-        String fileName = this.getAreaName() + "城管巡检处理报告【" + report.getReportCode() + "】.doc";
+        //String fileName = this.getAreaName() + "城管巡检处理报告【" + report.getReportCode() + "】.doc";
+        String fileName = areaName + "城管巡检处理报告【" + report.getReportCode() + "】.doc";
         DownloadUtil.download(response, filePath, fileName);
 
         return JsonResult.success();

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/export/ExportInspectionReportService.java

@@ -80,7 +80,8 @@ public class ExportInspectionReportService {
         }
 
         // 生成word
-        String areaName = this.getAreaName();
+        //String areaName = this.getAreaName();
+        String areaName = "江苏省泰州市海陵区";
         String titleName = areaName + "城管巡检报告";
         File f = new File(filePath);
         if (!f.exists() || f.length() < 1000) {
@@ -92,7 +93,8 @@ public class ExportInspectionReportService {
         }
 
         // 下载
-        String fileName = this.getAreaName() + "城管巡检报告【" + report.getReportCode() + "】.doc";
+        //String fileName = this.getAreaName() + "城管巡检报告【" + report.getReportCode() + "】.doc";
+        String fileName = areaName + "城管巡检报告【" + report.getReportCode() + "】.doc";
         DownloadUtil.download(response, filePath, fileName);
 
         return JsonResult.success();

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/export/GenerateReportWordService.java

@@ -120,44 +120,44 @@ public class GenerateReportWordService {
                 str = "任务名称";
             } else if (i == 3) {
                 str = report.getInspectionName();
-            } else if (i == 4) {
+            } /*else if (i == 4) {
                 str = "气象信息";
             } else if (i == 5) {
                 str = report.getWeather();
-            } else if (i == 6) {
+            } */else if (i == 4) {
                 str = "巡检部门";
-            } else if (i == 7) {
+            } else if (i == 5) {
                 str = this.getDeptName(report.getDeptId());
-            } else if (i == 8) {
+            } else if (i == 6) {
                 str = "巡检方式";
-            } else if (i == 9) {
+            } else if (i == 7) {
                 if (report.getInspectionType() == 1) {
                     str = "无人机";
                 } else if (report.getInspectionType() == 2) {
                     str = "机场巡逻";
                 } else if (report.getInspectionType() == 3) {
-                    str = "飞手值飞";
+                    str = "飞手执飞";
                 }
-            } else if (i == 10) {
+            } else if (i == 8) {
                 str = "巡查设备";
-            } else if (i == 11) {
+            } else if (i == 9) {
                 // 机场任务没有设备名称，暂定使用机场名称作为设备名称
                 if (InspectionTypeEnum.AIRPORT.getCode() == report.getInspectionType()) {
                     str = report.getAirportName();
                 } else {
                     str = report.getEquipmentName();
                 }
-            } else if (i == 12) {
+            } else if (i == 10) {
                 str = "巡查开始时间";
-            } else if (i == 13) {
+            } else if (i == 11) {
                 str = report.getExecutionStartTime() == null ? "" : DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, report.getExecutionStartTime());
-            } else if (i == 14) {
+            } else if (i == 12) {
                 str = "巡查结束时间";
-            } else if (i == 15) {
+            } else if (i == 13) {
                 str = report.getExecutionEndTime() == null ? "" : DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, report.getExecutionEndTime());
-            } else if (i == 16) {
+            } else if (i == 14) {
                 str = "巡检片区";
-            } else if (i == 17) {
+            } else if (i == 15) {
                 str = this.getRoadName(report.getChannelId());
             }
             Paragraph p = new Paragraph(str, font);