From 9541e07d0ca2565ef22f578fd46fabaaf8db073e Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 29 七月 2025 17:33:10 +0800
Subject: [PATCH] 新增时间查询状态
---
service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 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..927c1a7 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
@@ -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,55 @@
@TableField("is_deleted")
private Integer isDeleted;
+ public String getActualDepartureTimeBegin() {
+ return actualDepartureTimeBegin!=null?actualArrivalTimeBegin+" 00:00:00":null;
+ }
+ public void setActualDepartureTimeBegin(String actualDepartureTimeBegin) {
+ this.actualDepartureTimeBegin = actualDepartureTimeBegin;
+ }
+
+ public String getActualDepartureTimeEnd() {
+ return actualDepartureTimeEnd;
+ }
+
+ public void setActualDepartureTimeEnd(String actualDepartureTimeEnd) {
+ this.actualDepartureTimeEnd = actualDepartureTimeEnd!=null?actualDepartureTimeEnd+" 23:59:59":null;
+ }
+
+
+
+ public String getRequiredArrivalTimeBegin() {
+ return requiredArrivalTimeBegin;
+ }
+
+ public void setRequiredArrivalTimeBegin(String requiredArrivalTimeBegin) {
+ this.requiredArrivalTimeBegin = requiredArrivalTimeBegin!=null?requiredArrivalTimeBegin+" 00:00:00":null;
+ }
+
+ public String getRequiredArrivalTimeEnd() {
+ return requiredArrivalTimeEnd;
+ }
+
+ public void setRequiredArrivalTimeEnd(String requiredArrivalTimeEnd) {
+ this.requiredArrivalTimeEnd = requiredArrivalTimeEnd!=null?requiredArrivalTimeEnd+" 23:59:59":null;
+ }
+
+
+
+ public String getActualArrivalTimeBegin() {
+ return actualArrivalTimeBegin;
+ }
+
+ public void setActualArrivalTimeBegin(String actualArrivalTimeBegin) {
+ this.actualArrivalTimeBegin = actualArrivalTimeBegin!=null?actualArrivalTimeBegin+" 00:00:00":null;
+ }
+
+ public String getActualArrivalTimeEnd() {
+ return actualArrivalTimeEnd;
+ }
+
+ public void setActualArrivalTimeEnd(String actualArrivalTimeEnd) {
+ this.actualArrivalTimeEnd = actualArrivalTimeEnd!=null?actualArrivalTimeEnd+" 23:59:59":null;
+ }
}
--
Gitblit v1.8.0