From 5fb3c5b006a75633d78f0ada8757c45c391055d4 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期日, 28 九月 2025 15:19:53 +0800
Subject: [PATCH] 新增时间范围查询
---
service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java b/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
index 79fb6d4..6183783 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
@@ -66,6 +66,8 @@
@Excel(name = "璁㈠崟涓嬪崟鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("order_time")
private Date orderTime;
+ private String orderTimeBegin;
+ private String orderTimeEnd;
/** 璁㈠崟鍒涘缓鏃堕棿 */
@@ -73,6 +75,8 @@
@Excel(name = "璁㈠崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("order_created_time")
private Date orderCreatedTime;
+ private String orderCreatedTimeBegin;
+ private String orderCreatedTimeEnd;
/** 璋冨害鍗曞垱寤烘椂闂� */
@@ -80,6 +84,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("dispatch_created_time")
private Date dispatchCreatedTime;
+ private String dispatchCreatedTimeBegin;
+ private String dispatchCreatedTimeEnd;
/** 閽ュ寵棰嗗彇鏃堕棿锛堣姹傛煡璇㈡椂闂达級 */
@@ -95,6 +101,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("estimated_departure_time")
private Date estimatedDepartureTime;
+ /** 棰勮鍑哄彂鏃堕棿 */
+ @Excel(name = "瑕佹眰鍑哄彂鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("required_departure_time")
+ private Date requiredDepartureTime;
/** 瑕佹眰鍒拌揪鏃堕棿 */
@@ -161,5 +172,43 @@
@TableField("remark")
private String remark;
+ /**
+ * 璋冨害瓒呮椂涓嬪崟锛岃秴鏃�?涓皬鏃�
+ */
+ @TableField(exist = false)
+ private Integer schedulingTimeout;
+ /**
+ * '棰勮鍑哄彂鏃堕棿 & ord.ESTIMATED_DEPARTURE_TIME 锛岄鍙栭挜鍖欒秴鏃禢涓皬鏃�'
+ */
+ @TableField(exist = false)
+ private Integer keyTimeout;
+
+ @Excel(name = "閽ュ寵鏌滅紪鍙�")
+ @TableField("box_num")
+ private String boxNum;
+
+ public void setOrderTimeBegin(String orderTimeBegin) {
+ this.orderTimeBegin = orderTimeBegin==null? null :orderTimeBegin+ " 00:00:00";
+ }
+
+ public void setOrderTimeEnd(String orderTimeEnd) {
+ this.orderTimeEnd = orderTimeEnd==null?null:orderTimeEnd+ " 23:59:59";
+ }
+
+ public void setOrderCreatedTimeBegin(String orderCreatedTimeBegin) {
+ this.orderCreatedTimeBegin = orderCreatedTimeBegin==null? null :orderCreatedTimeBegin+ " 00:00:00";
+ }
+
+ public void setOrderCreatedTimeEnd(String orderCreatedTimeEnd) {
+ this.orderCreatedTimeEnd = orderCreatedTimeEnd==null?null:orderCreatedTimeEnd+ " 23:59:59";
+ }
+
+ public void setDispatchCreatedTimeBegin(String dispatchCreatedTimeBegin) {
+ this.dispatchCreatedTimeBegin = dispatchCreatedTimeBegin==null? null :dispatchCreatedTimeBegin+ " 00:00:00";
+ }
+
+ public void setDispatchCreatedTimeEnd(String dispatchCreatedTimeEnd) {
+ this.dispatchCreatedTimeEnd = dispatchCreatedTimeEnd==null?null:dispatchCreatedTimeEnd+ " 23:59:59";
+ }
}
--
Gitblit v1.8.0