From 849648e82e5dec96f9f30fcc9c9bd799268b1f4c Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:44 +0800
Subject: [PATCH] 新增资金流水导入
---
service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillAgingAnalysisVo.java | 161 ++++++++++++++++++++++-------------------------------
1 files changed, 66 insertions(+), 95 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillAgingAnalysisVo.java b/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillAgingAnalysisVo.java
index 3e53edb..cd3f76d 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillAgingAnalysisVo.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillAgingAnalysisVo.java
@@ -1,5 +1,7 @@
package com.ruoyi.cwgl.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@@ -13,215 +15,184 @@
/**
* ID
*/
+// @Excel(name = "ID", sort = 1)
private Integer id;
- /**
- * 绯荤粺缂栧彿
- */
- private String systemNo;
/**
* 璐﹀崟鍚嶇О
*/
private String billName;
-
- /**
- * 瀹㈡埛鍚嶇О
- */
- private String customerName;
-
- /**
- * 鏀舵浜�
- */
- private String payee;
-
/**
* 璐ｄ换浜�
*/
+ @Excel(name = "璐ｄ换浜�")
private String responsiblePerson;
/**
* 璐ｄ换棰嗗
*/
+ @Excel(name = "璐ｄ换棰嗗")
private String responsibleLeader;
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @Excel(name = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ /**
+ * 绯荤粺缂栧彿
+ */
+ @Excel(name = "璐﹀唽绯荤粺缂栧彿")
+ private String systemNo;
+
+
/**
* 缁撶畻鏂瑰紡
*/
+ @Excel(name = "缁撶畻鏂瑰紡")
private String settlementMethod;
/**
* 涓氬姟绫诲瀷
*/
+ @Excel(name = "涓氬姟绫诲瀷")
private String businessType;
/**
* 鎺ㄨ繘瑕佹眰
*/
+ @Excel(name = "鎺ㄨ繘瑕佹眰")
private String promotionRequirement;
- /**
- * 鏄惁鍐呴儴缁撶畻
- */
- private String isInternalSettlement;
+
+
+
/**
- * 鍐呴儴缁撶畻鍗曚綅
+ * 鍚殏浼板簲鏀惰处娆句綑棰�
+ * 宸茬‘璁ゅ簲鏀惰处娆鹃噾棰�
*/
- private String internalSettlementUnit;
-
- /**
- * 鍗曟嵁鏁伴噺
- */
- private Integer documentCount;
-
- /**
- * 搴旂粨绠楅噾棰�
- */
+ @Excel(name = "鍚殏浼板簲鏀惰处娆句綑棰�",scale = 2)
private BigDecimal totalAmount;
+
+ /**
+ * 宸茬‘璁ゅ簲鏀惰处娆鹃噾棰�
+ */
+ @Excel(name = "宸茬‘璁ゅ簲鏀惰处娆鹃噾棰�",scale = 2)
+ private BigDecimal confirmedAmount;
+
+ public BigDecimal getConfirmedAmount() {
+ return this.totalAmount;
+ }
/**
* 甯佸埗
*/
+ @Excel(name = "甯佸埗")
private String currency;
- /**
- * 鍑忓厤閲戦
- */
- private BigDecimal discountAmount;
+
/**
* 宸叉敹閲戦
*/
+ @Excel(name = "宸叉敹閲戦",scale = 2)
private BigDecimal receivedAmount;
/**
* 寰呮敹閲戦
*/
+ @Excel(name = "寰呮敹閲戦",scale = 2)
private BigDecimal pendingAmount;
- /**
- * 姹囩巼锛堟腐甯佸厬浜烘皯甯侊級
- */
- private BigDecimal exchangeRate;
- /**
- * 浜烘皯甯侀噾棰�
- */
- private BigDecimal cnyAmount;
- /**
- * 鍛ㄦ湡绫诲瀷
- */
- private String periodType;
-
- /**
- * 涓氬姟鏈熼棿寮�濮嬫棩鏈�
- */
- private Date businessStartDate;
-
- /**
- * 涓氬姟鏈熼棿缁撴潫鏃ユ湡
- */
- private Date businessEndDate;
/**
* 璐︽湡寮�濮嬫棩鏈�
*/
+ @Excel(name = "璐︽湡寮�濮嬫棩鏈�", dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date billingStartDate;
/**
* 璐︽湡缁撴潫鏃ユ湡
*/
+ @Excel(name = "璐︽湡缁撴潫鏃ユ湡", dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date billingEndDate;
- /**
- * 璐﹀崟鐢熸垚鏃ユ湡
- */
- private Date billGenerateDate;
- /**
- * 璐﹀崟鍙戦�佹棩鏈�
- */
- private Date billSendDate;
/**
* 璐﹀崟鍒版湡鏃ユ湡
*/
+ @Excel(name = "璐﹀崟鍒版湡鏃ユ湡", dateFormat = "yyyy-MM-dd")
private Date billDueDate;
- /**
- * 鐘舵��
- */
- private String status;
- /**
- * 澶囨敞
- */
- private String remark;
- /**
- * 鍒涘缓浜�
- */
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏇存柊浜�
- */
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private Date updateTime;
/**
* 30澶╁唴鍒版湡閲戦
*/
+ @Excel(name = "30澶╁唴鍒版湡閲戦",scale = 2)
private BigDecimal dueIn30Days;
- /**
- * 閫炬湡閲戦
- */
- private BigDecimal overdueAmount;
/**
* 閫炬湡1~30澶╅噾棰�
*/
+ @Excel(name = "閫炬湡1~30澶╅噾棰�",scale = 2)
private BigDecimal overdue1To30Days;
/**
* 閫炬湡31~60澶╅噾棰�
*/
+ @Excel(name = "閫炬湡31~60澶╅噾棰�" ,scale = 2)
private BigDecimal overdue31To60Days;
/**
* 閫炬湡61~90澶╅噾棰�
*/
+ @Excel(name = "閫炬湡61~90澶╅噾棰�",scale = 2)
private BigDecimal overdue61To90Days;
/**
* 閫炬湡91~180澶╅噾棰�
*/
+ @Excel(name = "閫炬湡91~180澶╅噾棰�",scale = 2)
private BigDecimal overdue91To180Days;
/**
* 閫炬湡181~365澶╅噾棰�
*/
+ @Excel(name = "閫炬湡181~365澶╅噾棰�",scale = 2)
private BigDecimal overdue181To365Days;
/**
* 閫炬湡1骞翠互涓婇噾棰�
*/
+ @Excel(name = "閫炬湡1骞翠互涓婇噾棰�",scale = 2)
private BigDecimal overdueOver1Year;
/**
* 閫炬湡澶╂暟
*/
+ @Excel(name = "閫炬湡澶╂暟")
private Integer overdueDays;
+
+ /**
+ * 寮�绁ㄦ棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "寮�绁ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date latestInvoiceTime;
+ /**
+ * 鏈紑绁ㄩ噾棰�
+ */
+ @Excel(name = "鏈紑绁ㄩ噾棰�")
+ private BigDecimal unInvoicedAmount;
}
\ No newline at end of file
--
Gitblit v1.8.0