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

performance-web/src/main/java/com/clx/performance/dto/excel/InvoiceData.java

 package com.clx.performance.dto.excel;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
@@ -23,6 +24,7 @@ public class InvoiceData {
     /**
      * 装货净重（单位吨）
      */
+    @ExcelIgnore
     private BigDecimal loadNet;
 }
 

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

@@ -186,18 +186,18 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
             rowData.add(new ExcelData(dto.getGoodsName()));
             rowData.add(new ExcelData(dto.getTruckNo()));
             rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
-            rowData.add(new ExcelData(SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
+            rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
             rowData.add(new ExcelData(SettlementDriverEnum.PrepayFreightFlag.getMsgByCode(dto.getPrepayFreightFlag())));
             rowData.add(new ExcelData(dto.getLoanFlagMsg()));
             rowData.add(new ExcelData(dto.getWeight()));
-            rowData.add(new ExcelData(dto.getFreightPrice()));
-            rowData.add(new ExcelData(dto.getFreight()));
-            rowData.add(new ExcelData(dto.getLossPrice()));
+            rowData.add(new ExcelData(dto.getFreightPrice()==null?null:dto.getFreightPrice().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getFreight()==null?null:dto.getFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getLossPrice()==null?null:dto.getLossPrice().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossWeight()));
-            rowData.add(new ExcelData(dto.getLossFreight()));
-            rowData.add(new ExcelData(dto.getSettlementFreight()));
+            rowData.add(new ExcelData(dto.getLossFreight()==null?null:dto.getLossFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getSettlementFreight()==null?null:dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getPlatformServiceFeeRate() + "%"));
-            rowData.add(new ExcelData(dto.getPlatformServiceFee()));
+            rowData.add(new ExcelData(dto.getPlatformServiceFee()==null?null:dto.getPlatformServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getSettlementNo()));
             rowData.add(new ExcelData(dto.getCreateTime()));