From 9324f68796bd8c4a307e2e1daf274930d60aa3bb Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 13 一月 2026 17:26:50 +0800
Subject: [PATCH] 新增确认接口
---
service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java | 64 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 4 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..75b8521 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
@@ -63,7 +63,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("created_time")
private Date createdTime;
-
+ @TableField(exist = false)
+ private String createdTimeBegin;
+ @TableField(exist = false)
+ private String createdTimeEnd;
/** 杩愯緭鏂瑰紡 */
@Excel(name = "杩愯緭鏂瑰紡")
@@ -167,21 +170,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 +384,28 @@
/**涓氬姟id淇敼鐢�*/
@TableField(exist = false)
private Integer serviceId;
+ /**
+ * 鏄惁鐢熸垚杩囧叆璐�0鍚�1鏄�
+ */
+ @TableField("is_create")
+ private Integer isCreate;
+ /**
+ * 鍏宠仈璐﹀崟id
+ */
+ @TableField("bill_id")
+ private Integer billId;
+ /** 鍏宠仈璐﹀崟鐘舵�� */
+ @Excel(name = "鍏宠仈璐﹀崟鐘舵��")
+ @TableField("related_bill_status")
+ private Integer relatedBillStatus;
+
+
+ /**
+ * 鍏宠仈璐﹀崟id
+ */
+ @Excel(name = "璐﹀崟鍚嶇О")
+ @TableField("bill_name")
+ private String billName;
public String getActualDepartureTimeBegin() {
return actualDepartureTimeBegin;
@@ -381,7 +423,21 @@
this.actualDepartureTimeEnd = actualDepartureTimeEnd==null?actualDepartureTimeEnd:actualDepartureTimeEnd+ " 23:59:59";
}
+ public String getCreatedTimeBegin() {
+ return createdTimeBegin;
+ }
+ public void setCreatedTimeBegin(String createdTimeBegin) {
+ this.createdTimeBegin = createdTimeBegin==null?createdTimeBegin:createdTimeBegin+ " 00:00:00";
+ }
+
+ public String getCreatedTimeEnd() {
+ return createdTimeEnd;
+ }
+
+ public void setCreatedTimeEnd(String createdTimeEnd) {
+ this.createdTimeEnd = createdTimeEnd==null?createdTimeEnd:createdTimeEnd+ " 23:59:59";
+ }
public String getRequiredArrivalTimeBegin() {
return requiredArrivalTimeBegin;
--
Gitblit v1.8.0