Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverDetailVO.java

@@ -34,6 +34,9 @@ public class PageCarrierBreakContractSettlementDriverDetailVO {
     @ApiModelProperty("车主用户编号")
     private Long truckOwnUserNo;
 
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
     @ApiModelProperty("司机名称")
     private String driverName;
 

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

@@ -55,14 +55,15 @@ public class BreakContractSettlementDriverDetailServiceImpl  implements BreakCon
         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, "运单编号", "childNo", 5000));
+        fieldList.add(new ExcelField(3, "车主名称", "truckOwnUserName", 5000));
+        fieldList.add(new ExcelField(4, "运单编号", "childNo", 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, "结算单号", "settlementNo", 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, "结算单号", "settlementNo", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -74,6 +75,7 @@ public class BreakContractSettlementDriverDetailServiceImpl  implements BreakCon
             rowData.add(new ExcelData(i+1));
             rowData.add(new ExcelData(dto.getBreakNo()));
             rowData.add(new ExcelData(dto.getTruckOwnUserNo()+""));
+            rowData.add(new ExcelData(dto.getTruckOwnName()));
             rowData.add(new ExcelData(dto.getChildNo()));
 
             rowData.add(new ExcelData(dto.getDriverName()));

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

@@ -52,16 +52,17 @@ public class BreakContractSettlementOwnerDetailServiceImpl  implements BreakCont
         // 组装表头
         List<ExcelField> fieldList = new ArrayList<>();
         fieldList.add(new ExcelField(0, "序号", "index", 2000));
-        fieldList.add(new ExcelField(1, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(2, "货主编号", "ownUserNo", 5000));
-        fieldList.add(new ExcelField(3, "货主名称", "ownerName", 5000));
+        fieldList.add(new ExcelField(1, "违约单号", "breakNo", 5000));
+        fieldList.add(new ExcelField(2, "订单编号", "orderNo", 5000));
+        fieldList.add(new ExcelField(3, "货主编号", "ownUserNo", 5000));
+        fieldList.add(new ExcelField(4, "货主名称", "ownerName", 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, "结算单号", "settlementNo", 5000));
 
-        fieldList.add(new ExcelField(4, "违约方", "breakContractPartyType", 5000));
-        fieldList.add(new ExcelField(5, "违约金额", "figure", 5000));
-        fieldList.add(new ExcelField(6, "创建人", "createName", 5000));
-        fieldList.add(new ExcelField(7, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(8, "结算单号", "settlementNo", 5000));
-        fieldList.add(new ExcelField(9, "违约单号", "breakNo", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -71,6 +72,7 @@ public class BreakContractSettlementOwnerDetailServiceImpl  implements BreakCont
             List<ExcelData> rowData = new ArrayList<>();
 
             rowData.add(new ExcelData(i+1));
+            rowData.add(new ExcelData(dto.getBreakNo()));
             rowData.add(new ExcelData(dto.getOrderNo()));
             rowData.add(new ExcelData(dto.getOwnerUserNo()+""));
             rowData.add(new ExcelData(dto.getOwnerName()));
@@ -80,7 +82,6 @@ public class BreakContractSettlementOwnerDetailServiceImpl  implements BreakCont
             rowData.add(new ExcelData(dto.getCreateName()));
             rowData.add(new ExcelData(dto.getCreateTime()));
             rowData.add(new ExcelData(dto.getSettlementNo()));
-            rowData.add(new ExcelData(dto.getBreakNo()));
 
             dataList.add(rowData);
         }

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

@@ -99,14 +99,14 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         // 组装表头
         List<ExcelField> fieldList = new ArrayList<>();
         fieldList.add(new ExcelField(0, "序号", "index", 2000));
-        fieldList.add(new ExcelField(1, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(2, "货主编号", "ownUserNo", 5000));
-        fieldList.add(new ExcelField(3, "货主名称", "ownerName", 5000));
-
-        fieldList.add(new ExcelField(4, "违约方", "breakContractPartyType", 5000));
-        fieldList.add(new ExcelField(5, "违约金额", "figure", 5000));
-        fieldList.add(new ExcelField(6, "状态", "statusMsg", 5000));
-        fieldList.add(new ExcelField(7, "结算单号", "settlementNo", 5000));
+        fieldList.add(new ExcelField(1, "结算单号", "settlementNo", 5000));
+        fieldList.add(new ExcelField(2, "订单编号", "orderNo", 5000));
+        fieldList.add(new ExcelField(3, "货主编号", "ownUserNo", 5000));
+        fieldList.add(new ExcelField(4, "货主名称", "ownerName", 5000));
+
+        fieldList.add(new ExcelField(5, "违约方", "breakContractPartyType", 5000));
+        fieldList.add(new ExcelField(6, "违约金额", "figure", 5000));
+        fieldList.add(new ExcelField(7, "状态", "statusMsg", 5000));
         fieldList.add(new ExcelField(8, "创建人", "createName", 5000));
         fieldList.add(new ExcelField(9, "创建时间", "createTime", 5000));
 
@@ -120,6 +120,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
             List<ExcelData> rowData = new ArrayList<>();
 
             rowData.add(new ExcelData(i+1));
+            rowData.add(new ExcelData(dto.getSettlementNo()));
             rowData.add(new ExcelData(dto.getOrderNo()));
             rowData.add(new ExcelData(dto.getOwnerUserNo()+""));
             rowData.add(new ExcelData(dto.getOwnerName()));
@@ -127,7 +128,6 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
             rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));
             rowData.add(new ExcelData(dto.getFigure().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getStatusMsg()));
-            rowData.add(new ExcelData(dto.getSettlementNo()));
             rowData.add(new ExcelData(dto.getCreateName()));
             rowData.add(new ExcelData(dto.getCreateTime()));