From d87721bf2b5cbbdc8088c9f9e0bfbba61b125a0f Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 04 九月 2025 14:12:21 +0800
Subject: [PATCH] 修改接口
---
service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 111 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 223ca5d..f43da9d 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
@@ -176,6 +176,23 @@
@TableField("estimated_total_cost")
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 = "棰勪及鍒╂鼎")
@@ -211,7 +228,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("actual_departure_time")
private Date actualDepartureTime;
-
+ @TableField(exist = false)
+ private String actualDepartureTimeBegin;
+ @TableField(exist = false)
+ private String actualDepartureTimeEnd;
/** 瑕佹眰鍒拌揪鏃堕棿 */
@Excel(name = "瑕佹眰鍒拌揪鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -219,7 +239,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("required_arrival_time")
private Date requiredArrivalTime;
-
+ @TableField(exist = false)
+ private String requiredArrivalTimeBegin;
+ @TableField(exist = false)
+ private String requiredArrivalTimeEnd;
/** 瀹為檯鍒拌揪鏃堕棿 */
@Excel(name = "瀹為檯鍒拌揪鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -227,7 +250,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("actual_arrival_time")
private Date actualArrivalTime;
-
+ @TableField(exist = false)
+ private String actualArrivalTimeBegin;
+ @TableField(exist = false)
+ private String actualArrivalTimeEnd;
/** 鏄惁鍥炵▼ */
@Excel(name = "鏄惁鍥炵▼")
@@ -352,5 +378,87 @@
@TableField("update_time")
private Date updateTime;
+ /**涓氬姟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;
+ }
+
+ public void setActualDepartureTimeBegin(String actualDepartureTimeBegin) {
+ this.actualDepartureTimeBegin = actualDepartureTimeBegin==null?actualDepartureTimeBegin:actualDepartureTimeBegin+ " 00:00:00";
+ }
+
+ public String getActualDepartureTimeEnd() {
+ return actualDepartureTimeEnd;
+ }
+
+ public void setActualDepartureTimeEnd(String actualDepartureTimeEnd) {
+ this.actualDepartureTimeEnd = actualDepartureTimeEnd==null?actualDepartureTimeEnd:actualDepartureTimeEnd+ " 23:59:59";
+ }
+
+
+
+ public String getRequiredArrivalTimeBegin() {
+ return requiredArrivalTimeBegin;
+ }
+
+ public void setRequiredArrivalTimeBegin(String requiredArrivalTimeBegin) {
+ this.requiredArrivalTimeBegin = requiredArrivalTimeBegin==null?requiredArrivalTimeBegin:requiredArrivalTimeBegin+ " 00:00:00";
+ }
+
+ public String getRequiredArrivalTimeEnd() {
+ return requiredArrivalTimeEnd;
+ }
+
+ public void setRequiredArrivalTimeEnd(String requiredArrivalTimeEnd) {
+ this.requiredArrivalTimeEnd = requiredArrivalTimeEnd==null?requiredArrivalTimeEnd:requiredArrivalTimeEnd+ " 23:59:59";
+ }
+
+ public Date getActualArrivalTime() {
+ return actualArrivalTime;
+ }
+
+ public void setActualArrivalTime(Date actualArrivalTime) {
+ this.actualArrivalTime = actualArrivalTime;
+ }
+
+ public String getActualArrivalTimeBegin() {
+ return actualArrivalTimeBegin;
+ }
+
+ public void setActualArrivalTimeBegin(String actualArrivalTimeBegin) {
+ this.actualArrivalTimeBegin = actualArrivalTimeBegin==null?actualArrivalTimeBegin:actualArrivalTimeBegin+ " 00:00:00";
+ }
+
+ public String getActualArrivalTimeEnd() {
+ return actualArrivalTimeEnd;
+ }
+
+ public void setActualArrivalTimeEnd(String actualArrivalTimeEnd) {
+ this.actualArrivalTimeEnd = actualArrivalTimeEnd==null?actualArrivalTimeEnd:actualArrivalTimeEnd+ " 23:59:59";
+ }
}
--
Gitblit v1.8.0