From 0d3e86ccbd7fce9055668eece7aaeebedb329657 Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Tue, 16 Jun 2026 15:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E7=BB=93=E7=AE=97=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oem/pojo/excel/OemStatementExcel.java     | 38 ++++++++++++++++++-
 .../desk/oem/mapper/OemStatementMapper.xml    |  9 +++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStatementExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStatementExcel.java
index 63967da11..f4bf475e5 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStatementExcel.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStatementExcel.java
@@ -9,8 +9,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
 
 
 /**
@@ -121,4 +119,40 @@ public class OemStatementExcel implements Serializable {
     @ExcelProperty("结算状态")
     private String rosStatusName;
 
+    @ColumnWidth(20)
+    @ExcelProperty("异常原因")
+    private String memo;
+
+    @ColumnWidth(20)
+    @ExcelProperty("报价单号")
+    private String quotation;
+
+    @ColumnWidth(20)
+    @ExcelProperty("计量单位")
+    private String unit;
+
+    @ColumnWidth(20)
+    @ExcelProperty("结算单价")
+    private BigDecimal unitPrice;
+
+    @ColumnWidth(20)
+    @ExcelProperty("结算金额")
+    private BigDecimal totalPrice;
+
+    @ColumnWidth(20)
+    @ExcelProperty("结算时间")
+    private String settleDate;
+
+    @ColumnWidth(20)
+    @ExcelProperty("审核时间")
+    private String approvalDate;
+
+    @ColumnWidth(20)
+    @ExcelProperty("推送时间")
+    private String pushDate;
+
+    @ColumnWidth(20)
+    @ExcelProperty("结算单号")
+    private String statementNo;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
index 9a0970ffe..fceb4391e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
@@ -130,6 +130,15 @@
         <result column="USE_DEPT_CODE" property="useDeptCode"/>
         <result column="PUT_STORE_DATE" property="putStoreDate"/>
         <result column="ROS_STATUS_NAME" property="rosStatusName"/>
+        <result column="MEMO" property="memo"/>
+        <result column="QUOTATION" property="quotation"/>
+        <result column="UNIT" property="unit"/>
+        <result column="UNIT_PRICE" property="unitPrice"/>
+        <result column="TOTAL_PRICE" property="totalPrice"/>
+        <result column="SETTLE_TIME" property="settleTime"/>
+        <result column="APPROVAL_TIME" property="approvalTime"/>
+        <result column="PUSH_TIME" property="pushTime"/>
+        <result column="STATEMENT_NO" property="statementNo"/>
     </resultMap>
 
     <select id="selectUnsettled" resultMap="statementVOResultMap">