订单报价-车主运单计费--列表、导出--新增开票配置

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

@@ -162,21 +162,22 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
         fieldList.add(new ExcelField(4, "车主名称", "driverName", 5000));
         fieldList.add(new ExcelField(5, "货物名称", "goodsName", 5000));
         fieldList.add(new ExcelField(6, "车牌号", "truckNo", 5000));
-        fieldList.add(new ExcelField(7, "开票公司", "invoicingCompanyShorterName", 5000));
-        fieldList.add(new ExcelField(8, "开票标识", "invoiceType", 5000));
-        fieldList.add(new ExcelField(9, "预付标识", "prepayFreightFlag", 5000));
+        fieldList.add(new ExcelField(7, "开票配置", "invoicingConfigType", 5000));
+        fieldList.add(new ExcelField(8, "开票公司", "invoicingCompanyShorterName", 5000));
+        fieldList.add(new ExcelField(9, "开票标识", "invoiceType", 5000));
         fieldList.add(new ExcelField(10, "借款标识", "loanFlagMsg", 5000));
-        fieldList.add(new ExcelField(11, "实际净重（吨）", "weight", 5000));
-        fieldList.add(new ExcelField(12, "运费单价", "freightPrice", 5000));
-        fieldList.add(new ExcelField(13, "应付运费", "freight", 5000));
-        fieldList.add(new ExcelField(14, "货损单价", "lossPrice", 5000));
-        fieldList.add(new ExcelField(15, "货损吨数", "lossWeight", 5000));
-        fieldList.add(new ExcelField(16, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(17, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(18, "毛利率", "platformServiceFeeRate", 5000));
-        fieldList.add(new ExcelField(19, "毛利润", "platformServiceFee", 5000));
-        fieldList.add(new ExcelField(20, "结算单号", "settlementNo", 5000));
-        fieldList.add(new ExcelField(21, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(11, "预付标识", "prepayFreightFlag", 5000));
+        fieldList.add(new ExcelField(12, "实际净重（吨）", "weight", 5000));
+        fieldList.add(new ExcelField(13, "运费单价", "freightPrice", 5000));
+        fieldList.add(new ExcelField(14, "应付运费", "freight", 5000));
+        fieldList.add(new ExcelField(15, "货损单价", "lossPrice", 5000));
+        fieldList.add(new ExcelField(16, "货损吨数", "lossWeight", 5000));
+        fieldList.add(new ExcelField(17, "货损金额", "lossFreight", 5000));
+        fieldList.add(new ExcelField(18, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(19, "毛利率", "platformServiceFeeRate", 5000));
+        fieldList.add(new ExcelField(20, "毛利润", "platformServiceFee", 5000));
+        fieldList.add(new ExcelField(21, "结算单号", "settlementNo", 5000));
+        fieldList.add(new ExcelField(22, "创建时间", "createTime", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -193,6 +194,8 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
             rowData.add(new ExcelData(dto.getDriverName()));
             rowData.add(new ExcelData(dto.getGoodsName()));
             rowData.add(new ExcelData(dto.getTruckNo()));
+            // 开票配置
+            rowData.add(new ExcelData(dto.getInvoicingConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(dto.getInvoicingConfigType())));
             rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
             rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
             rowData.add(new ExcelData(dto.getPrepayFreightFlag()==null?null:SettlementDriverEnum.PrepayFreightFlag.getMsgByCode(dto.getPrepayFreightFlag())));

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverDetailVO.java

@@ -78,6 +78,8 @@ public class CarrierPageSettlementDriverDetailVO {
     private Integer invoicingCompanyId;
     @Schema(description = "开票公司简称")
     private String invoicingCompanyShorterName;
+    @Schema(description = "开票配置")
+    private Integer invoicingConfigType;
     @MoneyOutConvert
     @Schema(description = "平台服务费")
     private BigDecimal platformServiceFee;