故障申报更新
This commit is contained in:
parent
45a12d498f
commit
03c52195d6
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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());
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user