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/ReceivableBillAccountAnalysisVo.java |  158 ++++++++++++++++++++--------------------------------
 1 files changed, 62 insertions(+), 96 deletions(-)

diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillAccountAnalysisVo.java b/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillAccountAnalysisVo.java
index 976b9ad..8d1463d 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillAccountAnalysisVo.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillAccountAnalysisVo.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;
@@ -10,148 +12,112 @@
 @Data
 public class ReceivableBillAccountAnalysisVo {
 
-    /**
-     * ID
+       /* ID
      */
     private Integer id;
 
-    /**
-     * 绯荤粺缂栧彿
-     */
-    private String systemNo;
 
     /**
      * 璐﹀崟鍚嶇О
      */
     private String billName;
-
     /**
-     * 瀹㈡埛鍚嶇О
+     * 缁撶畻鍗曚綅
      */
+    @Excel(name = "缁撶畻鍗曚綅")
     private String customerName;
-
-    /**
-     * 鏀舵浜�
-     */
-    private String payee;
-
-    /**
-     * 璐d换浜�
-     */
-    private String responsiblePerson;
-
-    /**
-     * 璐d换棰嗗
-     */
-    private String responsibleLeader;
-
-    /**
-     * 缁撶畻鏂瑰紡
-     */
-    private String settlementMethod;
-
-    /**
-     * 涓氬姟绫诲瀷
-     */
-    private String businessType;
-
-    /**
-     * 鎺ㄨ繘瑕佹眰
-     */
-    private String promotionRequirement;
 
     /**
      * 缁撶畻绉嶇被
      */
-    private String settlementCategory;
+    @Excel(name = "缁撶畻绉嶇被")
+    private String businessType;
+
+    /**
+     * 璐﹀崟绯荤粺缂栧彿
+     */
+    @Excel(name = "璐﹀崟绯荤粺缂栧彿")
+    private String systemNo;
 
     /**
      * 缁撶畻鏈�
      */
+    @Excel(name = "缁撶畻鏈�")
     private String settlementPeriod;
-
-    /**
-     * 搴旂粨绠楅噾棰�
-     */
-    private BigDecimal totalAmount;
-
-    /**
-     * 宸叉敹閲戦
-     */
-    private BigDecimal receivedAmount;
-
-    /**
-     * 寰呮敹閲戦
-     */
-    private BigDecimal pendingAmount;
-
-    /**
-     * 鏀舵瀹屾垚鐜�
-     */
-    private BigDecimal collectionRate;
 
     /**
      * NC璐﹂潰缁撶畻鏃ユ湡
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "NC璐﹂潰缁撶畻鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     private Date ncSettlementDate;
 
     /**
      * NC璐﹂潰缁撶畻閲戦
      */
+    @Excel(name = "NC璐﹂潰缁撶畻閲戦")
     private BigDecimal ncSettlementAmount;
 
     /**
-     * NC缁撶畻瀹屾垚鐜�
+     * 杩樻鏈�鍚庢湡闄�
      */
-    private BigDecimal ncSettlementRate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "杩樻鏈�鍚庢湡闄�", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date billDueDate;
 
     /**
-     * 璐︽澶囨敞
+     * 杩樻鏃�
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "杩樻鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date latestRepaymentDate;
+
+    /**
+     * 杩樻閲戦
+     */
+    @Excel(name = "杩樻閲戦",scale = 2)
+    private BigDecimal latestRepaymentAmount;
+
+    /**
+     * 寮�绁ㄦ棩鏈�
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "寮�绁ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date latestInvoiceTime;
+
+    /**
+     * 寮�绁ㄩ噾棰�
+     */
+    @Excel(name = "寮�绁ㄩ噾棰�",scale = 2)
+    private BigDecimal totalInvoiceAmount;
+
+    /**
+     * 鏈紑绁ㄩ噾棰�
+     */
+    @Excel(name = "鏈紑绁ㄩ噾棰�",scale = 2)
+    private BigDecimal unInvoicedAmount;
+
+    /**
+     * 澶囨敞
+     */
+    @Excel(name = "澶囨敞")
     private String accountRemark;
 
     /**
-     * 閫炬湡鍒╂伅
+     * 灏氭瑺閲戦
      */
-    private BigDecimal overdueInterest;
-
-    /**
-     * 璐﹀崟鍒版湡鏃ユ湡
-     */
-    private Date billDueDate;
+    @Excel(name = "灏氭瑺閲戦",scale = 2)
+    private BigDecimal pendingAmount;
 
     /**
      * 閫炬湡澶╂暟
      */
+    @Excel(name = "閫炬湡澶╂暟")
     private Integer overdueDays;
 
     /**
-     * 鐘舵��
+     * 閫炬湡鍒╂伅
      */
-    private String status;
-
-    /**
-     * 鍒涘缓鏃堕棿
-     */
-    private Date createTime;
-
-    /**
-     * 鏇存柊鏃堕棿
-     */
-    private Date updateTime;
-
-    /**
-     * 璐﹂緞鍒嗘瀽鐘舵��
-     */
-    private String agingStatus;
-
-    /**
-     * 缁撶畻鐘舵��
-     */
-    private String settlementStatus;
-
-    /**
-     * NC瀵规帴鐘舵��
-     */
-    private String ncSyncStatus;
+    @Excel(name = "閫炬湡鍒╂伅",scale = 2)
+    private BigDecimal overdueInterest;
 }
\ No newline at end of file

--
Gitblit v1.8.0