From 03c52195d6e4f0b313c1eb042bd3a5f3b3383029 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Mon, 31 Mar 2025 08:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=94=B3=E6=8A=A5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/bst/fault/domain/Fault.java   | 8 ++++++++
 .../src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java | 7 +++----
 .../main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml  | 4 ++--
 .../main/java/com/ruoyi/web/app/AppFaultController.java   | 2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java
index 56f5a01..084fd6e 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java
@@ -5,6 +5,7 @@ import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -56,4 +57,11 @@ public class Fault extends BaseEntity
     @ApiModelProperty("是否处理")
     private String handle;
 
+    @Excel(name = "订单结束时间")
+    @ApiModelProperty("订单结束时间")
+    private Date orderEndTime;
+
+    @Excel(name = "车牌号")
+    @ApiModelProperty("车牌号")
+    private String vehicleNum;
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java
index c126115..7ca320d 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java
@@ -3,17 +3,16 @@ package com.ruoyi.bst.fault.domain;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
+import java.util.Date;
+
 
 @Data
 public class FaultVO extends Fault{
 
     @ApiModelProperty("订单时间")
-    private LocalDateTime orderEndTime;
+    private Date orderEndTime;
 
     @ApiModelProperty("故障原因")
     private String faultSite;
 
-    @ApiModelProperty("车牌号")
-    private String vehicleNum;
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml
index 9aa7200..d25bf27 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appealStatus != null and appealStatus != ''">appeal_status,</if>
             <if test="createTime != null">create_time,</if>
             <if test="userId != null">user_id,</if>
-            <if test="vehicle_num != null">vehicle_num,</if>
+            <if test="vehicleNum != null">vehicle_num</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userName != null and userName != ''">#{userName},</if>
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appealStatus != null and appealStatus != ''">#{appealStatus},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="userId != null">#{userId},</if>
-            <if test="vehicle_num != null">#{vehicleNum},</if>
+            <if test="vehicleNum != null">#{vehicleNum}</if>
          </trim>
     </insert>
 
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java
index 0a0021c..c0c5167 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java
@@ -57,7 +57,7 @@ public class AppFaultController extends BaseController {
         if (device.getOrderId() != null) {
             OrderVO order = orderService.selectOrderById(device.getOrderId());
             if (order.getEndTime() != null) {
-                fault.setOrderEndTime(order.getEndTime());
+                fault.setOrderEndTime(DateUtils.toDate(order.getEndTime()));
             }
             fault.setOrderId(device.getOrderId());
         }