From 65a12fccec8ad0306817eb057adb102c54f2046f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 28 五月 2025 15:57:17 +0800
Subject: [PATCH] 添加出租车的视频设备号
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Order.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Order.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Order.java
index 4a20814..3d06a29 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Order.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Order.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.api.model;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -7,6 +9,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.time.LocalDateTime;
/**
@@ -16,6 +20,7 @@
@Data
@ApiModel
@TableName("t_order")
+@ExcelTarget(("order"))
public class Order {
/**
* 主键
@@ -28,6 +33,7 @@
*/
@TableField("code")
@ApiModelProperty(value = "订单编号")
+ @Excel(name = "订单编号", width = 30)
private String code;
/**
* 车辆id
@@ -36,12 +42,14 @@
@ApiModelProperty(value = "车辆id")
private Integer carId;
- @TableField(exist = false)
+ @TableField("vehicle_number")
@ApiModelProperty(value = "车牌号")
+ @Excel(name = "车牌号", width = 30)
private String vehicleNumber;
@TableField(exist = false)
@ApiModelProperty(value = "车牌颜色")
+ @Excel(name = "车牌颜色", width = 30)
private String licensePlateColor;
/**
* 驾驶员id
@@ -51,8 +59,8 @@
private Integer driverId;
@TableField(exist = false)
- @ApiModelProperty(value = "司机姓名")
- private String driverName;
+ @ApiModelProperty(value = "驾驶证编号")
+ private String drivingLicenseNumber;
/**
* 企业id
*/
@@ -62,6 +70,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "企业名称")
+ @Excel(name = "车辆所属公司", width = 30)
private String enterpriseName;
/**
* 下单地
@@ -70,23 +79,49 @@
@ApiModelProperty(value = "下单地")
private String orderPlace;
/**
+ * 发起地区划
+ */
+ @TableField("order_place_code")
+ @ApiModelProperty(value = "发起地区划")
+ private String orderPlaceCode;
+ /**
* 上车点
*/
@TableField("boarding_point")
@ApiModelProperty(value = "上车点")
+ @Excel(name = "上车地点", width = 30)
private String boardingPoint;
/**
* 下车点
*/
@TableField("drop_off_point")
@ApiModelProperty(value = "下车点")
+ @Excel(name = "下车地点", width = 30)
private String dropOffPoint;
/**
* 载客里程
*/
@TableField("passenger_mileage")
@ApiModelProperty(value = "载客里程")
+ @Excel(name = "载客里程", width = 30)
private String passengerMileage;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "司机姓名")
+ @Excel(name = "驾驶员名称", width = 30)
+ private String driverName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "司机电话")
+ @Excel(name = "驾驶员电话", width = 30)
+ private String driverPhone;
+
+
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "视频设备号")
+ private String deviceId;
+
/**
* 订单时间
*/
@@ -98,12 +133,14 @@
*/
@TableField("order_delivery_time")
@ApiModelProperty(value = "派单时间")
+ @Excel(name = "派单时间", width = 30)
private String orderDeliveryTime;
/**
* 订单金额
*/
@TableField("order_amount")
@ApiModelProperty(value = "订单金额")
+ @Excel(name = "订单金额", width = 30)
private String orderAmount;
/**
* 支付金额
@@ -129,4 +166,9 @@
@TableField("remark")
@ApiModelProperty(value = "乘客备注")
private String remark;
+ /**
+ * 添加时间
+ */
+ @TableField("create_time")
+ private LocalDateTime createTime;
}
--
Gitblit v1.7.1