From e6a9f5e801495e965eb1dbe40fcf9dd5df4eb6a5 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 29 九月 2025 08:53:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java | 12 +++++++++++-
1 files changed, 11 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 122b176..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;
/** 璐圭敤鍚嶇О */
@@ -75,7 +77,7 @@
@Excel(name = "棰勪及璐圭敤閲戦")
@TableField("estimated_amount")
- private Long estimatedAmount;
+ private BigDecimal estimatedAmount;
/** 甯佸埗 */
@@ -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";
+ }
+
}
--
Gitblit v1.8.0