Merge branch 'refs/heads/v20.9_settlement_20240805' into test

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

@@ -44,13 +44,15 @@ public class SettlementOwnerExportServiceImpl implements SettlementOwnerExportSe
 
         fieldList.add(new ExcelField(10, "预付运费金额", "prepayFreight", 5000));
         fieldList.add(new ExcelField(11, "货损吨数", "lossWeight", 5000));
-        fieldList.add(new ExcelField(12, "管理费", "invoiceServiceFee", 5000));
-        fieldList.add(new ExcelField(13, "借款抵扣金额", "loanFreight", 5000));
-        fieldList.add(new ExcelField(14, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(12, "货损金额", "lossFreight", 5000));
+        fieldList.add(new ExcelField(13, "管理费", "invoiceServiceFee", 5000));
+        fieldList.add(new ExcelField(14, "借款抵扣金额", "loanFreight", 5000));
 
-        fieldList.add(new ExcelField(15, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(16, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(17, "状态", "status", 5000));
+        fieldList.add(new ExcelField(15, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(16, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(17, "开票公司", "invoicingCompanyShorterName", 5000));
+        fieldList.add(new ExcelField(18, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(19, "状态", "status", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -73,11 +75,13 @@ public class SettlementOwnerExportServiceImpl implements SettlementOwnerExportSe
 
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
             rowData.add(new ExcelData(dto.getLossWeight()));
+            rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
             rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
             rowData.add(new ExcelData(dto.getLoanFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
-            rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
 
+            rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
+            rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
             rowData.add(new ExcelData(dto.getCreateTime()));
             rowData.add(new ExcelData(dto.getStatusMsg()));