From fe9ae222e5823f85d14cfe6f7c825172b0d43830 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期日, 28 九月 2025 14:55:44 +0800
Subject: [PATCH] 新增下单日期查询时间范围
---
service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml | 3 ++-
service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java | 10 ++++++++++
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java
index b890a00..59c7a9d 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java
@@ -56,6 +56,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("order_date")
private Date orderDate;
+ private String orderDateBegin;
+ private String orderDateEnd;
/** 璐圭敤鍚嶇О */
@@ -155,5 +157,13 @@
@TableField("deleted")
private Integer deleted;
+ public void setOrderDateBegin(String orderDateBegin) {
+ this.orderDateBegin = orderDateBegin==null? null :orderDateBegin+ " 00:00:00";
+ }
+
+ public void setOrderDateEnd(String orderDateEnd) {
+ this.orderDateEnd = orderDateEnd==null?null:orderDateEnd+ " 23:59:59";
+ }
+
}
diff --git a/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml b/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml
index 3462f13..2a5e1c3 100644
--- a/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml
@@ -40,7 +40,8 @@
<if test="dispatchNo != null and dispatchNo != ''"> and thisTab.dispatch_no = #{dispatchNo}</if>
<if test="customerName != null and customerName != ''"> and thisTab.customer_name like concat('%', #{customerName}, '%')</if>
<if test="projectName != null and projectName != ''"> and thisTab.project_name like concat('%', #{projectName}, '%')</if>
- <if test="orderDate != null "> and thisTab.order_date = #{orderDate}</if>
+ <if test="orderDateBegin != null and orderDateBegin!='' and orderDateEnd != null and orderDateEnd!='' "> and thisTab.order_date between #{orderDateBegin} and #{orderDateEnd}</if>
+
<if test="feeName != null and feeName != ''"> and thisTab.fee_name like concat('%', #{feeName}, '%')</if>
<if test="estimatedAmount != null "> and thisTab.estimated_amount = #{estimatedAmount}</if>
<if test="currency != null and currency != ''"> and thisTab.currency = #{currency}</if>
--
Gitblit v1.8.0