From 1091c0e1f8a96391fff3f918594b3ed6b1986c63 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 07 一月 2026 16:09:07 +0800
Subject: [PATCH] 新增开票接口

---
 service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java |   18 +++++++++++++++++-
 1 files changed, 17 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 81cf126..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;
 
 
     /** 璐圭敤鍚嶇О */
@@ -64,12 +66,18 @@
         @TableField("fee_name")
     private String feeName;
 
+    /** 璐圭敤绫诲瀷 */
+//    @Excel(name = "璐圭敤绫诲瀷")
+
+        @TableField("fee_type")
+    private Integer feeType;
+
 
     /** 棰勪及璐圭敤閲戦 */
     @Excel(name = "棰勪及璐圭敤閲戦")
 
         @TableField("estimated_amount")
-    private Long estimatedAmount;
+    private BigDecimal estimatedAmount;
 
 
     /** 甯佸埗 */
@@ -149,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