导出增加车主名称

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementDriverDetailServiceImpl.java

@@ -54,9 +54,10 @@ public class BreakContractSettlementDriverDetailServiceImpl  implements BreakCon
         List<ExcelField> fieldList = new ArrayList<>();
         fieldList.add(new ExcelField(0, "序号", "index", 2000));
         fieldList.add(new ExcelField(1, "违约单号", "breakNo", 5000));
-        fieldList.add(new ExcelField(2, "车主编码", "truckOwnUserNo", 5000));
-        fieldList.add(new ExcelField(3, "车主名称", "truckOwnUserName", 5000));
-        fieldList.add(new ExcelField(4, "运单编号", "childNo", 5000));
+        fieldList.add(new ExcelField(2, "运单编号", "childNo", 5000));
+        fieldList.add(new ExcelField(3, "车主编码", "truckOwnUserNo", 5000));
+        fieldList.add(new ExcelField(4, "车主名称", "truckOwnUserName", 5000));
+
 
         fieldList.add(new ExcelField(5, "司机名称", "driverName", 5000));
         fieldList.add(new ExcelField(6, "违约方", "breakContractPartyType", 5000));
@@ -74,9 +75,10 @@ public class BreakContractSettlementDriverDetailServiceImpl  implements BreakCon
 
             rowData.add(new ExcelData(i+1));
             rowData.add(new ExcelData(dto.getBreakNo()));
+            rowData.add(new ExcelData(dto.getChildNo()));
             rowData.add(new ExcelData(dto.getTruckOwnUserNo()+""));
             rowData.add(new ExcelData(dto.getTruckOwnName()));
-            rowData.add(new ExcelData(dto.getChildNo()));
+
 
             rowData.add(new ExcelData(dto.getDriverName()));
             rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementDriverServiceImpl.java

@@ -57,15 +57,16 @@ public class BreakContractSettlementDriverServiceImpl implements BreakContractSe
         fieldList.add(new ExcelField(1, "结算单号", "settlementNo", 5000));
         fieldList.add(new ExcelField(2, "运单编号", "childNo", 5000));
         fieldList.add(new ExcelField(3, "车主编号", "truckOwnerNo", 5000));
+        fieldList.add(new ExcelField(4, "车主名称", "truckOwnerName", 5000));
 
-        fieldList.add(new ExcelField(4, "司机名称", "driverName", 5000));
-        fieldList.add(new ExcelField(5, "违约方", "breakContractPartyType", 5000));
-        fieldList.add(new ExcelField(6, "违约金额", "figure", 5000));
-        fieldList.add(new ExcelField(7, "创建人", "createName", 5000));
-        fieldList.add(new ExcelField(8, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(9, "结算平台", "settlePlatform", 5000));
-        fieldList.add(new ExcelField(9, "结算状态", "settleStatus", 5000));
-        fieldList.add(new ExcelField(9, "结算时间", "settleTime", 5000));
+        fieldList.add(new ExcelField(5, "司机名称", "driverName", 5000));
+        fieldList.add(new ExcelField(6, "违约方", "breakContractPartyType", 5000));
+        fieldList.add(new ExcelField(7, "违约金额", "figure", 5000));
+        fieldList.add(new ExcelField(8, "创建人", "createName", 5000));
+        fieldList.add(new ExcelField(9, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(10, "结算平台", "settlePlatform", 5000));
+        fieldList.add(new ExcelField(11, "结算状态", "settleStatus", 5000));
+        fieldList.add(new ExcelField(12, "结算时间", "settleTime", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -78,6 +79,7 @@ public class BreakContractSettlementDriverServiceImpl implements BreakContractSe
             rowData.add(new ExcelData(dto.getSettlementNo()));
             rowData.add(new ExcelData(dto.getChildNo()));
             rowData.add(new ExcelData(dto.getTruckOwnUserNo()+""));
+            rowData.add(new ExcelData(dto.getTruckOwnName()));
 
             rowData.add(new ExcelData(dto.getDriverName()));
             rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));