From 6b8f073df16ed45ec9e710abe18d1f4ffde30540 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期五, 19 十二月 2025 08:49:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 3b50813..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 = "杩愯緭鏂瑰紡")
@@ -391,10 +394,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;
@@ -414,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