From 00e51d1fa06d62590ec3a7d3762bd1dd57e94988 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 09:18:04 +0800
Subject: [PATCH] 修改
---
service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 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 6f580d0..3b50813 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;
/** 鐢靛瓙閿� */
@@ -364,6 +381,22 @@
/**涓氬姟id淇敼鐢�*/
@TableField(exist = false)
private Integer serviceId;
+ /**
+ * 鏄惁鐢熸垚杩囧叆璐�0鍚�1鏄�
+ */
+ @TableField("is_create")
+ private Integer isCreate;
+ /**
+ * 鍏宠仈璐﹀崟id
+ */
+ @TableField("bill_id")
+ private Integer billId;
+
+ /**
+ * 鍏宠仈璐﹀崟id
+ */
+ @TableField("bill_name")
+ private String billName;
public String getActualDepartureTimeBegin() {
return actualDepartureTimeBegin;
--
Gitblit v1.8.0