应付明细表头修改

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportReceivableDataDetailDto.java

@@ -40,14 +40,14 @@ public class ReportReceivableDataDetailDto {
     /**
      * 保险公司名称
      */
-    @ExcelProperty(value = "保险公司", index = 0)
+    @ExcelProperty(value = {"保险公司", "保险公司"}, index = 0)
     @ColumnWidth(20)
     @Schema(description = "保险公司")
     private String companyName;
     /**
      *  地区
      */
-    @ExcelProperty(value = "地区", index = 1)
+    @ExcelProperty(value =  {"地区", "地区"}, index = 1)
     @ColumnWidth(20)
     @Schema(description = "地区")
     private String partnerCompanyName;
@@ -55,16 +55,16 @@ public class ReportReceivableDataDetailDto {
     /**
      *  应收总计
      */
-    @ExcelProperty(value = "应收总计", index = 2)
-    @ColumnWidth(15)
+    @ExcelProperty(value =  {"应收", "应收总计"}, index = 2)
+    @ColumnWidth(25)
     @Schema(description = "应收总计")
     private BigDecimal accountsReceivableSumMoney;
 
     /**
      *  应收手续费
      */
-    @ExcelProperty(value = "应收手续费", index = 3)
-    @ColumnWidth(15)
+    @ExcelProperty(value = {"应收", "应收手续费"}, index = 3)
+    @ColumnWidth(25)
     @Schema(description = "应收手续费")
     private BigDecimal accountsReceivableCommissionMoney;
 
@@ -72,16 +72,16 @@ public class ReportReceivableDataDetailDto {
     /**
      *  应收跟单费
      */
-    @ExcelProperty(value = "应收跟单费", index = 4)
-    @ColumnWidth(15)
+    @ExcelProperty(value = {"应收","应收跟单费"}, index = 4)
+    @ColumnWidth(25)
     @Schema(description = "应收跟单费")
     private BigDecimal accountsReceivableFollowUpFeeMoney;
 
     /**
      *  未开票总计
      */
-    @ExcelProperty(value = "未开票总计", index = 5)
-    @ColumnWidth(10)
+    @ExcelProperty(value = {"未开票","未开票总计"}, index = 5)
+    @ColumnWidth(25)
     @Schema(description = "未开票总计")
     private BigDecimal uninvoicedSumMoney;
 
@@ -89,22 +89,22 @@ public class ReportReceivableDataDetailDto {
     /**
      *  未开票手续费
      */
-    @ExcelProperty(value = "未开票手续费", index = 6)
-    @ColumnWidth(10)
+    @ExcelProperty(value = {"未开票","未开票手续费"}, index = 6)
+    @ColumnWidth(25)
     @Schema(description = "未开票手续费")
     private BigDecimal uninvoicedCommissionMoney;
     /**
      *  未开票跟单费
      */
-    @ExcelProperty(value = "未开票跟单费", index = 7)
-    @ColumnWidth(10)
+    @ExcelProperty(value = {"未开票","未开票跟单费"}, index = 7)
+    @ColumnWidth(25)
     @Schema(description = "未开票跟单费")
     private BigDecimal uninvoicedFollowUpFeeMoney;
 
     /**
      *  已开票总计
      */
-    @ExcelProperty(value = "已开票总计", index = 8)
+    @ExcelProperty(value = {"已开票","已开票总计"}, index = 8)
     @ColumnWidth(20)
     @Schema(description = "已开票总计")
     private BigDecimal invoicedSumMoney;
@@ -113,8 +113,8 @@ public class ReportReceivableDataDetailDto {
     /**
      *  已开票手续费
      */
-    @ExcelProperty(value = "已开票手续费", index = 9)
-    @ColumnWidth(20)
+    @ExcelProperty(value = {"已开票","已开票手续费"}, index = 9)
+    @ColumnWidth(25)
     @Schema(description = "已开票手续费")
     private BigDecimal invoicedCommissionMoney;
 
@@ -122,16 +122,16 @@ public class ReportReceivableDataDetailDto {
     /**
      *  已开票跟单费
      */
-    @ExcelProperty(value = "已开票跟单费", index = 10)
-    @ColumnWidth(15)
+    @ExcelProperty(value = {"已开票","已开票跟单费"}, index = 10)
+    @ColumnWidth(25)
     @Schema(description = "已开票跟单费")
     private BigDecimal invoicedFollowUpFeeMoney;
 
     /**
      *  未结算总计
      */
-    @ExcelProperty(value = "未结算总计", index = 11)
-    @ColumnWidth(20)
+    @ExcelProperty(value = {"未结算","未结算总计"}, index = 11)
+    @ColumnWidth(25)
     @Schema(description = "未结算总计")
     private BigDecimal unsettledSumMoney;
 
@@ -139,8 +139,8 @@ public class ReportReceivableDataDetailDto {
     /**
      *  未结算手续费
      */
-    @ExcelProperty(value = "未结算手续费", index = 12)
-    @ColumnWidth(20)
+    @ExcelProperty(value = {"未结算","未结算手续费"}, index = 12)
+    @ColumnWidth(25)
     @Schema(description = "未结算手续费")
     private BigDecimal unsettledCommissionMoney;
 
@@ -148,16 +148,16 @@ public class ReportReceivableDataDetailDto {
     /**
      *  未结算跟单费
      */
-    @ExcelProperty(value = "未结算跟单费", index = 13)
-    @ColumnWidth(15)
+    @ExcelProperty(value = {"未结算","未结算跟单费"}, index = 13)
+    @ColumnWidth(25)
     @Schema(description = "未结算跟单费")
     private BigDecimal unsettledFollowUpFeeMoney;
 
     /**
      *  已结算总计
      */
-    @ExcelProperty(value = "已结算总计", index = 14)
-    @ColumnWidth(20)
+    @ExcelProperty(value = {"已结算","已结算总计"}, index = 14)
+    @ColumnWidth(25)
     @Schema(description = "已结算总计")
     private BigDecimal settledSumMoney;
 
@@ -165,8 +165,8 @@ public class ReportReceivableDataDetailDto {
     /**
      *  已结算手续费
      */
-    @ExcelProperty(value = "已结算手续费", index = 15)
-    @ColumnWidth(20)
+    @ExcelProperty(value = {"已结算","已结算手续费"}, index = 15)
+    @ColumnWidth(25)
     @Schema(description = "已结算手续费")
     private BigDecimal settledCommissionMoney;
 
@@ -174,8 +174,8 @@ public class ReportReceivableDataDetailDto {
     /**
      *  已结算跟单费
      */
-    @ExcelProperty(value = "已结算跟单费", index = 16)
-    @ColumnWidth(15)
+    @ExcelProperty(value = {"已结算","已结算跟单费"}, index = 16)
+    @ColumnWidth(25)
     @Schema(description = "已结算跟单费")
     private BigDecimal settledFollowUpFeeMoney;
 }