From 955b8306e4574e7ccf206b09d4a065268589e100 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期六, 13 十二月 2025 22:12:14 +0800
Subject: [PATCH] 提交
---
tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
index 201fa73..86d8425 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.Date;
+import java.util.List;
+
import lombok.Data;
/**
* 璋冨害鍗曠鐞嗗璞� tms_dispatch_order
@@ -187,6 +189,15 @@
@TableField("earliest_departure")
private Date earliestDeparture;
+
+ /** 涓嬪崟鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("order_time")
+ private Date orderTime;
+ @TableField(exist = false)
+ private String orderTimeBegin;
+ @TableField(exist = false)
+ private String orderTimeEnd;
/** 鍙戣揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
@Excel(name = "鍙戣揣浜�", readConverterExp = "鍏�=鑱旀敹鍙戣揣浜轰俊鎭�")
@@ -387,7 +398,8 @@
@Excel(name = "鐘舵��")
@TableField("status")
private Integer status;
-
+ @TableField(exist = false)
+ private List<Integer> inStatusList;
/** 鍒涘缓浜� */
@TableField("create_by")
@@ -398,7 +410,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("create_time")
private Date createTime;
-
+ @TableField(exist = false)
+ private String createTimeBegin;
+ @TableField(exist = false)
+ private String createTimeEnd;
/** 鏇存柊浜� */
@Excel(name = "鏇存柊浜�")
@@ -411,7 +426,10 @@
@Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("update_time")
private Date updateTime;
-
+ @TableField(exist = false)
+ private String updateTimeBegin;
+ @TableField(exist = false)
+ private String updateTimeEnd;
/** 澶囨敞 */
@TableField("remark")
@@ -455,6 +473,9 @@
@TableField("is_customs")
private Integer isCustoms;
+ @TableField("is_load")
+ private Integer isLoad;
+
@TableField("start_region_code")
private String startRegionCode;
@TableField("end_region_code")
@@ -468,4 +489,35 @@
@Excel(name = "鍏宠仈鎶ヤ环鏂规ID")
@TableField("quote_plan_id")
private Integer quotePlanId;
+
+ /**
+ * 纭鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("confirm_time")
+ private Date confirmTime;
+ @TableField(exist = false)
+ private String confirmTimeBegin;
+ @TableField(exist = false)
+ private String confirmTimeEnd;
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("ok_time")
+ private Date okTime;
+
+ @TableField(exist = false)
+ private String okTimeBegin;
+ @TableField(exist = false)
+ private String okTimeEnd;
+ @TableField("commission_model")
+ private Integer commissionModel;
+
+ @TableField(exist = false)
+ private List<TmsQuoteFee> quoteFeeItems;
+ @TableField(exist = false)
+ private List<TmsReceivableFeeItem> tmsReceivableFeeItems;
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0