From 85b9dbfaa4afdc5738dcf97a40b50b58b1ee6ad6 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期五, 15 八月 2025 17:19:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java b/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
index 3613070..9a4a2dc 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
@@ -5,7 +5,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.Date;
import lombok.Data;
/**
* 璋冨害鍗曞璞� dispatch_order
@@ -24,9 +23,10 @@
/** 璋冨害鍗曞彿 */
@Excel(name = "璋冨害鍗曞彿")
-
- @TableField("dispatch_no")
+ @TableField("dispatch_no")
private String dispatchNo;
+ @TableField("customer_name")
+ private String customerName;
/** 杩愯緭鏂瑰紡 */
@@ -107,24 +107,35 @@
/** 瀹為檯鍑哄彂鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "瀹為檯鍑哄彂鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "瀹為檯鍑哄彂鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("actual_departure_time")
private Date actualDepartureTime;
-
+ @TableField(exist = false)
+ private String actualDepartureTimeBegin;
+ @TableField(exist = false)
+ private String actualDepartureTimeEnd;
/** 瑕佹眰鍒拌揪鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "瑕佹眰鍒拌揪鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "瑕佹眰鍒拌揪鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("required_arrival_time")
private Date requiredArrivalTime;
+ @TableField(exist = false)
+ private String requiredArrivalTimeBegin;
+ @TableField(exist = false)
+ private String requiredArrivalTimeEnd;
/** 瀹為檯鍒拌揪鏃堕棿 */
- @Excel(name = "瀹為檯鍒拌揪鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "瀹為檯鍒拌揪鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("actual_arrival_time")
private Date actualArrivalTime;
+ @TableField(exist = false)
+ private String actualArrivalTimeBegin;
+ @TableField(exist = false)
+ private String actualArrivalTimeEnd;
/** 鏄惁鍥炵▼(N,Y) */
@@ -197,5 +208,33 @@
@TableField("is_deleted")
private Integer isDeleted;
+ public void setActualDepartureTimeBegin(String actualDepartureTimeBegin) {
+ this.actualDepartureTimeBegin = actualDepartureTimeBegin!=null?actualDepartureTimeBegin+" 00:00:00":null;
+ }
+
+ public void setActualDepartureTimeEnd(String actualDepartureTimeEnd) {
+ this.actualDepartureTimeEnd = actualDepartureTimeEnd!=null?actualDepartureTimeEnd+" 23:59:59":null;
+ }
+
+
+
+
+ public void setRequiredArrivalTimeBegin(String requiredArrivalTimeBegin) {
+ this.requiredArrivalTimeBegin = requiredArrivalTimeBegin!=null?requiredArrivalTimeBegin+" 00:00:00":null;
+ }
+
+
+ public void setRequiredArrivalTimeEnd(String requiredArrivalTimeEnd) {
+ this.requiredArrivalTimeEnd = requiredArrivalTimeEnd!=null?requiredArrivalTimeEnd+" 23:59:59":null;
+ }
+
+
+ public void setActualArrivalTimeBegin(String actualArrivalTimeBegin) {
+ this.actualArrivalTimeBegin = actualArrivalTimeBegin!=null?actualArrivalTimeBegin+" 00:00:00":null;
+ }
+
+ public void setActualArrivalTimeEnd(String actualArrivalTimeEnd) {
+ this.actualArrivalTimeEnd = actualArrivalTimeEnd!=null?actualArrivalTimeEnd+" 23:59:59":null;
+ }
}
--
Gitblit v1.8.0