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"
appeal_status,
create_time,
user_id,
- vehicle_num,
+ vehicle_num
#{userName},
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{appealStatus},
#{createTime},
#{userId},
- #{vehicleNum},
+ #{vehicleNum}
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());
}