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/resources/mapper/cwgl/RequestLogMapper.xml | 3 ++-
service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java | 30 ++++++++++++++++++++++++++++++
service/src/main/java/com/ruoyi/cwgl/domain/RequestLog.java | 8 ++++++++
service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java | 10 +++++++++-
service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml | 7 ++++---
5 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java
index 8a184b1..4ce7d55 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java
@@ -114,7 +114,8 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("create_time")
private Date createTime;
-
+ private String createTimeBegin;
+ private String createTimeEnd;
/** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -128,5 +129,12 @@
@TableField("deleted")
private Integer deleted;
+ public void setCreateTimeBegin(String createTimeBegin) {
+ this.createTimeBegin = createTimeBegin==null? null :createTimeBegin+ " 00:00:00";
+ }
+
+ public void setCreateTimeEnd(String createTimeEnd) {
+ this.createTimeEnd = createTimeEnd==null?null:createTimeEnd+ " 23:59:59";
+ }
}
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 120ad4c..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;
/** 閽ュ寵棰嗗彇鏃堕棿锛堣姹傛煡璇㈡椂闂达級 */
@@ -181,4 +187,28 @@
@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";
+ }
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/RequestLog.java b/service/src/main/java/com/ruoyi/cwgl/domain/RequestLog.java
index 3900da7..6167c3f 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/RequestLog.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/RequestLog.java
@@ -58,6 +58,8 @@
@Excel(name = "璇锋眰鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("req_time")
private Date reqTime;
+ private String reqTimeBegin;
+ private String reqTimeEnd;
/** 0涓婃姤鍙栧嚭1褰掕繕涓婃姤 */
@@ -73,5 +75,11 @@
@TableField("operation")
private String operation;
+ public void setReqTimeBegin(String reqTimeBegin) {
+ this.reqTimeBegin = reqTimeBegin==null? null :reqTimeBegin+ " 00:00:00";
+ }
+ public void setReqTimeEnd(String reqTimeEnd) {
+ this.reqTimeEnd = reqTimeEnd==null?null:reqTimeEnd+ " 23:59:59";
+ }
}
diff --git a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
index 6ce8e2d..1ed85f6 100644
--- a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
@@ -45,9 +45,10 @@
<if test="driverName != null and driverName != ''"> and thisTab.driver_name like concat('%', #{driverName}, '%')</if>
<if test="driverMobile != null and driverMobile != ''"> and thisTab.driver_mobile = #{driverMobile}</if>
<if test="licensePlateNumber != null and licensePlateNumber != ''"> and thisTab.license_plate_number = #{licensePlateNumber}</if>
- <if test="orderTime != null "> and thisTab.order_time = #{orderTime}</if>
- <if test="orderCreatedTime != null "> and thisTab.order_created_time = #{orderCreatedTime}</if>
- <if test="dispatchCreatedTime != null "> and thisTab.dispatch_created_time = #{dispatchCreatedTime}</if>
+ <if test="orderTimeBegin != null and orderTimeBegin!='' and orderTimeEnd != null and orderTimeEnd!='' "> and thisTab.order_time between #{orderTimeBegin} and #{orderTimeEnd}</if>
+ <if test="orderCreatedTimeBegin != null and orderCreatedTimeBegin!='' and orderCreatedTimeEnd != null and orderCreatedTimeEnd!='' "> and thisTab.order_created_time between #{orderCreatedTimeBegin} and #{orderCreatedTimeEnd}</if>
+ <if test="dispatchCreatedTimeBegin != null and dispatchCreatedTimeBegin!='' and dispatchCreatedTimeEnd != null and dispatchCreatedTimeEnd!='' "> and thisTab.dispatch_created_time between #{dispatchCreatedTimeBegin} and #{dispatchCreatedTimeEnd}</if>
+
<if test="keyCollectionTime != null "> and thisTab.key_collection_time = #{keyCollectionTime}</if>
<if test="estimatedDepartureTime != null "> and thisTab.estimated_departure_time = #{estimatedDepartureTime}</if>
<if test="requiredArrivalTime != null "> and thisTab.required_arrival_time = #{requiredArrivalTime}</if>
diff --git a/service/src/main/resources/mapper/cwgl/RequestLogMapper.xml b/service/src/main/resources/mapper/cwgl/RequestLogMapper.xml
index 83062d9..8c7c17b 100644
--- a/service/src/main/resources/mapper/cwgl/RequestLogMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/RequestLogMapper.xml
@@ -27,7 +27,8 @@
<if test="driverCode != null and driverCode != ''"> and thisTab.driver_code = #{driverCode}</if>
<if test="driverName != null and driverName != ''"> and thisTab.driver_name like concat('%', #{driverName}, '%')</if>
<if test="boxNum != null and boxNum != ''"> and thisTab.box_num = #{boxNum}</if>
- <if test="reqTime != null "> and thisTab.req_time = #{reqTime}</if>
+ <if test="reqTimeBegin != null and reqTimeBegin!='' and reqTimeEnd != null and reqTimeEnd!='' "> and thisTab.req_time between #{reqTimeBegin} and #{reqTimeEnd}</if>
+
<if test="type != null "> and thisTab.type = #{type}</if>
<if test="operation != null and operation != ''"> and thisTab.operation = #{operation}</if>
</sql>
--
Gitblit v1.8.0