结算单优化

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

@@ -622,15 +622,14 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         fieldList.add(new ExcelField(19, "开票金额", "invoiceFreight", 5000));
         fieldList.add(new ExcelField(20, "订单编号", "orderNo", 5000));
         fieldList.add(new ExcelField(21, "结算单号", "settlementNo", 5000));
-        fieldList.add(new ExcelField(22, "结算子单号", "settlementSubNo", 5000));
-        fieldList.add(new ExcelField(23, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(24, "是否已付尾款", "finalPaymentStatusMsg", 5000));
-        fieldList.add(new ExcelField(25, "是否已开票", "invoiceStatusMsg", 5000));
+        fieldList.add(new ExcelField(22, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(23, "是否已付尾款", "finalPaymentStatusMsg", 5000));
+        fieldList.add(new ExcelField(24, "是否已开票", "invoiceStatusMsg", 5000));
         if (param.getInvoiceStatus().equals(SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())) {
-            fieldList.add(new ExcelField(26, "备注", "separateRemark", 5000));
+            fieldList.add(new ExcelField(25, "备注", "separateRemark", 5000));
         }else {
-            fieldList.add(new ExcelField(26, "开票时间", "invoiceTime", 5000));
-            fieldList.add(new ExcelField(27, "备注", "separateRemark", 5000));
+            fieldList.add(new ExcelField(25, "开票时间", "invoiceTime", 5000));
+            fieldList.add(new ExcelField(26, "备注", "separateRemark", 5000));
         }
 
         // 组装数据
@@ -662,7 +661,6 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(vo.getInvoiceFreight()==null?null:vo.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(vo.getOrderNo()));
             rowData.add(new ExcelData(vo.getSettlementNo()));
-            rowData.add(new ExcelData(vo.getSettlementSubNo()));
             rowData.add(new ExcelData(vo.getCreateTime()));
             rowData.add(new ExcelData(vo.getFinalPaymentStatusMsg()));
             rowData.add(new ExcelData(vo.getInvoiceStatusMsg()));