订单报价-封控异常处理--列表、导出

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

@@ -144,14 +144,15 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
         fieldList.add(new ExcelField(3, "司机联系电话", "driverMobile", 5000));
         fieldList.add(new ExcelField(4, "货物名称", "goodsName", 5000));
         fieldList.add(new ExcelField(5, "开票标识", "invoiceType", 5000));
-        fieldList.add(new ExcelField(6, "风控标识", "riskType", 5000));
-        fieldList.add(new ExcelField(7, "风控失败原因", "riskRemark", 5000));
-        fieldList.add(new ExcelField(8, "处理状态", "status", 5000));
-        fieldList.add(new ExcelField(9, "处理方式", "processMethod", 5000));
-        fieldList.add(new ExcelField(10, "磅单审核通过时间", "poundAuditTime", 5000));
-        fieldList.add(new ExcelField(11, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(12, "处理人", "processBy", 5000));
-        fieldList.add(new ExcelField(13, "处理时间", "processTime", 5000));
+        fieldList.add(new ExcelField(6, "开票配置", "invoiceConfigType", 5000));
+        fieldList.add(new ExcelField(7, "风控标识", "riskType", 5000));
+        fieldList.add(new ExcelField(8, "风控失败原因", "riskRemark", 5000));
+        fieldList.add(new ExcelField(9, "处理状态", "status", 5000));
+        fieldList.add(new ExcelField(10, "处理方式", "processMethod", 5000));
+        fieldList.add(new ExcelField(11, "磅单审核通过时间", "poundAuditTime", 5000));
+        fieldList.add(new ExcelField(12, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(13, "处理人", "processBy", 5000));
+        fieldList.add(new ExcelField(14, "处理时间", "processTime", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -164,6 +165,7 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
 
             rowData.add(new ExcelData(vo.getGoodsName()));
             rowData.add(new ExcelData(vo.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(vo.getInvoiceType())));
+            rowData.add(new ExcelData(vo.getInvoiceConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(vo.getInvoiceConfigType())));
             rowData.add(new ExcelData(vo.getRiskType()==null?null:SettlementOrderChildRiskEnum.RiskType.getMsgByCode(vo.getRiskType())));
             rowData.add(new ExcelData(vo.getRiskRemark()));
             rowData.add(new ExcelData(vo.getStatus()==null?null:SettlementOrderChildRiskEnum.Status.getMsgByCode(vo.getStatus())));

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

@@ -31,6 +31,9 @@ public class SettlementOrderChildRiskVO {
     @Schema(description = "开票标识：1网运单 2普通单")
     private Integer invoiceType;
 
+    @Schema(description = "开票配置，0否，1是")
+    private Integer invoiceConfigType;
+
     @Schema(description = "磅单审核通过时间")
     private String poundAuditTime;