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/EstimatedReceivableBill.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 663653b..4ce7d55 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java
@@ -54,20 +54,20 @@
@Excel(name = "搴旂粨绠楅噾棰�")
@TableField("total_amount")
- private Long totalAmount;
+ private BigDecimal totalAmount;
/** 宸茬粨绠楅噾棰� */
@Excel(name = "宸茬粨绠楅噾棰�")
@TableField("settled_amount")
- private Long settledAmount;
+ private BigDecimal settledAmount;
/**
* 鏈缁撶畻閲戦
*/
@TableField(exist = false)
- private Long settlementAmount;
+ private BigDecimal settlementAmount;
/** 寮�绁ㄧ姸鎬� */
@Excel(name = "寮�绁ㄧ姸鎬�")
@@ -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";
+ }
}
--
Gitblit v1.8.0