Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/FlightData.java

@@ -15,6 +15,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("th_flight_data")
 public class FlightData extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -27,7 +28,6 @@ public class FlightData extends BaseEntity {
      */
     private String tenantId;
 
-
     /**
      * 云盒SN号
      */
@@ -88,5 +88,4 @@ public class FlightData extends BaseEntity {
      */
     private Integer isSrt;
 
-
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/ReportPageListVo.java

@@ -16,6 +16,11 @@ import java.util.Date;
 @Data
 public class ReportPageListVo {
 
+    /**
+     * 报告ID
+     */
+    private String id;
+
     /**
      * 任务编号
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/workorder/WorkOrderDetailsVo.java

@@ -1,6 +1,8 @@
 package com.tuoheng.admin.vo.workorder;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -32,6 +34,8 @@ public class WorkOrderDetailsVo {
     /**
      * 工单生成时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/workorder/WorkOrderPageListVo.java

@@ -1,6 +1,8 @@
 package com.tuoheng.admin.vo.workorder;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -82,6 +84,8 @@ public class WorkOrderPageListVo {
     /**
      * 指派时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date assignTime;
 
     /**

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java

@@ -283,9 +283,6 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
             return JsonResult.error("未查询出对应的问题及处理结果");
         }
         //对属性处理
-        if (StringUtils.isNotEmpty(vo.getFileOriginal())) {
-            vo.setFileOriginal(CommonConfig.imageURL + vo.getFileOriginal());
-        }
         if (StringUtils.isNotEmpty(vo.getFileImage())) {
             vo.setFileImage(CommonConfig.imageURL + vo.getFileImage());
         }

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

@@ -521,7 +521,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 covert.setFileThumbnail(CommonConfig.imageURL + p.getFileThumbnail());
             }
             if (StringUtils.isNotEmpty(p.getFileOriginal())) {
-                covert.setFileOriginal(CommonConfig.imageURL + p.getFileThumbnail());
+                covert.setFileOriginal(CommonConfig.imageURL + p.getFileOriginal());
             }
             //任务名称  任务执行时间 道路位置编号
             if (StringUtils.isEmpty(p.getInspectionId())) {