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 @@ + + + + + + + + +