From 08e4910e7e509c97eca734f132f2726e5cbcd5b9 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 16 Apr 2025 15:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=A4=96=E7=BB=B4=E4=BF=AE=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsBusrepairBwBillPageListVo.java               | 14 ++++++++++----
 .../biz/asbusrepairbill/AsBusrepairBillMapper.xml  |  4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java
index 454069b3e4..3889a5bf9e 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java
@@ -36,13 +36,19 @@ public class AsBusrepairBwBillPageListVo {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date entryTime;
     @ApiModelProperty("工时费")
-    private BigDecimal hourAmount;
+    private String hourAmount;
     @ApiModelProperty("材料费")
-    private BigDecimal goodsAmount;
+    private String goodsAmount;
     @ApiModelProperty("外出费")
-    private BigDecimal outAmount;
+    private String outAmount;
     @ApiModelProperty("其他费用")
-    private BigDecimal otherAmount;
+    private String otherAmount;
     @ApiModelProperty("加税点项目")
     private String taxItems;
+    @ApiModelProperty("施救费用")
+    private String rescueAmount;
+    @ApiModelProperty("结算金额")
+    private String settleAmount;
+    @ApiModelProperty("结算日期")
+    private String settleTime;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
index a5ab843643..4a9b980613 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
@@ -224,7 +224,9 @@
         a.goodsAmount,
         a.outAmount,
         a.otherAmount,
-        ai.taxItems
+        ai.taxItems,
+        a.rescueAmount,
+        a.settleAmount
         from as_busrepair_bill a
         LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid
         left join as_busrepair_bill_invoice as ai on a.sid = ai.billSid