From e6462541cd39109c4f7ec6e9fa7f8dbd5c4dee5e Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 01 九月 2025 10:03:23 +0800
Subject: [PATCH] 新增前后端
---
service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java b/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
index 35c804f..f43da9d 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
@@ -167,21 +167,38 @@
@Excel(name = "棰勪及鎬绘敹鍏�")
@TableField("estimated_total_income")
- private Long estimatedTotalIncome;
+ private BigDecimal estimatedTotalIncome;
/** 棰勪及鎬绘垚鏈� */
@Excel(name = "棰勪及鎬绘垚鏈�")
@TableField("estimated_total_cost")
- private Long estimatedTotalCost;
+ private BigDecimal estimatedTotalCost;
+
+ /** 纭鎬绘敹鍏� */
+ @Excel(name = "纭鎬绘敹鍏�")
+ @TableField("confirmed_total_income")
+ private BigDecimal confirmedTotalIncome;
+ /** 纭鎬绘垚鏈� */
+ @Excel(name = "纭鎬绘垚鏈�")
+ @TableField("confirmed_total_cost")
+ private BigDecimal confirmedTotalCost;
+
+ /**鏄惁鍖归厤鏀跺叆(0:鏈尮閰�;1:宸插尮閰�)*/
+ @TableField("is_income_matched")
+ private Integer isIncomeMatched;
+
+ /**鏄惁鍖归厤鎴愭湰(0:鏈尮閰�;1:宸插尮閰�)*/
+ @TableField("is_cost_matched")
+ private Integer isCostMatched;
/** 棰勪及鍒╂鼎 */
@Excel(name = "棰勪及鍒╂鼎")
@TableField("estimated_profit")
- private Long estimatedProfit;
+ private BigDecimal estimatedProfit;
/** 鐢靛瓙閿� */
@@ -374,10 +391,16 @@
*/
@TableField("bill_id")
private Integer billId;
+ /** 鍏宠仈璐﹀崟鐘舵�� */
+ @Excel(name = "鍏宠仈璐﹀崟鐘舵��")
+ @TableField("related_bill_status")
+ private Integer relatedBillStatus;
+
/**
* 鍏宠仈璐﹀崟id
*/
+ @Excel(name = "璐﹀崟鍚嶇О")
@TableField("bill_name")
private String billName;
--
Gitblit v1.8.0