承运优化需求9.30

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java

@@ -456,16 +456,20 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         fieldList.add(new ExcelField(12, "管理费", "invoiceServiceFee", 5000));
         fieldList.add(new ExcelField(13, "预付运费金额", "prepayFreight", 5000));
         fieldList.add(new ExcelField(14, "借款抵扣金额", "loanFreight", 5000));
+
         fieldList.add(new ExcelField(15, "结算金额", "settlementFreight", 5000));
         fieldList.add(new ExcelField(16, "开票金额", "invoiceFreight", 5000));
         fieldList.add(new ExcelField(17, "开票标识", "invoiceType", 5000));
-        fieldList.add(new ExcelField(18, "状态", "handleStatus", 5000));
-        fieldList.add(new ExcelField(19, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(20, "结算单号", "settlementNo", 5000));
-        fieldList.add(new ExcelField(21, "磅单审核通过时间", "poundAuditTime", 5000));
-        fieldList.add(new ExcelField(22, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(23, "操作人", "invoicingCompanyModifiedBy", 5000));
-        fieldList.add(new ExcelField(24, "操作时间", "invoicingCompanyModifiedTime", 5000));
+        fieldList.add(new ExcelField(18, "开票公司", "invoicingCompanyShorterName", 5000));
+        fieldList.add(new ExcelField(19, "状态", "handleStatus", 5000));
+
+        fieldList.add(new ExcelField(20, "订单编号", "orderNo", 5000));
+        fieldList.add(new ExcelField(21, "结算单号", "settlementNo", 5000));
+        fieldList.add(new ExcelField(22, "磅单审核通过时间", "poundAuditTime", 5000));
+        fieldList.add(new ExcelField(23, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(24, "操作人", "invoicingCompanyModifiedBy", 5000));
+
+        fieldList.add(new ExcelField(25, "操作时间", "invoicingCompanyModifiedTime", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -489,10 +493,13 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getInvoiceServiceFee()==null?null:dto.getInvoiceServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getPrepayFreight()==null?null:dto.getPrepayFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLoanFreight()==null?null:dto.getLoanFreight().movePointLeft(2)));
+
             rowData.add(new ExcelData(dto.getSettlementFreight()==null?null:dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceFreight()==null?null:dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
+            rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName(),"-"));
             rowData.add(new ExcelData(SettlementOwnerDetailEnum.HandleStatus.getMsgByCode(dto.getHandleStatus())));
+
             rowData.add(new ExcelData(dto.getOrderNo()));
             rowData.add(new ExcelData(dto.getSettlementNo()));
             rowData.add(new ExcelData(dto.getPoundAuditTime()));