货主结算单明细增加结算方式字段

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

@@ -28,6 +28,7 @@ import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * @author liruixin
@@ -179,25 +180,24 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         fieldList.add(new ExcelField(0, "序号", "index", 2000));
         fieldList.add(new ExcelField(1, "运单编号", "childNo", 5000));
         fieldList.add(new ExcelField(2, "货主编码", "ownerUserNno", 5000));
-        fieldList.add(new ExcelField(3, "货物名称", "goodsName", 5000));
-
-        fieldList.add(new ExcelField(4, "实际净重（吨）", "weight", 5000));
-        fieldList.add(new ExcelField(5, "平台运费报价", "freightPrice", 5000));
-        fieldList.add(new ExcelField(6, "实际运费金额", "freight", 5000));
-        fieldList.add(new ExcelField(7, "货损吨数", "lossWeight", 5000));
-        fieldList.add(new ExcelField(8, "货损单价", "lossPrice", 5000));
-        fieldList.add(new ExcelField(9, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(10, "预付运费金额", "prepayFreight", 5000));
-        fieldList.add(new ExcelField(11, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(12, "开票金额", "invoiceFreight", 5000));
-
-        fieldList.add(new ExcelField(13, "开票标识", "invoiceType", 5000));
-        fieldList.add(new ExcelField(14, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(15, "结算单号", "settlementNo", 15000));
-        fieldList.add(new ExcelField(16, "结算子单号", "settlementSubNo", 15000));
-        fieldList.add(new ExcelField(17, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(18, "是否已付尾款", "finalPaymentStatus", 5000));
-        fieldList.add(new ExcelField(19, "是否已开票", "invoiceStatus", 5000));
+        fieldList.add(new ExcelField(3, "结算方式", "settlementWay", 5000));
+        fieldList.add(new ExcelField(4, "货物名称", "goodsName", 5000));
+        fieldList.add(new ExcelField(5, "实际净重（吨）", "weight", 5000));
+        fieldList.add(new ExcelField(6, "平台运费报价", "freightPrice", 5000));
+        fieldList.add(new ExcelField(7, "实际运费金额", "freight", 5000));
+        fieldList.add(new ExcelField(8, "货损吨数", "lossWeight", 5000));
+        fieldList.add(new ExcelField(9, "货损单价", "lossPrice", 5000));
+        fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
+        fieldList.add(new ExcelField(11, "预付运费金额", "prepayFreight", 5000));
+        fieldList.add(new ExcelField(12, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(13, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(14, "开票标识", "invoiceType", 5000));
+        fieldList.add(new ExcelField(15, "订单编号", "orderNo", 5000));
+        fieldList.add(new ExcelField(16, "结算单号", "settlementNo", 15000));
+        fieldList.add(new ExcelField(17, "结算子单号", "settlementSubNo", 15000));
+        fieldList.add(new ExcelField(18, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(19, "是否已付尾款", "finalPaymentStatus", 5000));
+        fieldList.add(new ExcelField(20, "是否已开票", "invoiceStatus", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -206,11 +206,13 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             PageOwnerSettlementOwnerDetailVO dto = list.get(i);
             List<ExcelData> rowData = new ArrayList<>();
 
+            Optional<SettlementWayEnum.WayType> byCode = SettlementWayEnum.WayType.getByCode(dto.getSettlementWay());
+            String settlementWay = byCode.isPresent()?byCode.get().getMsg():"";
             rowData.add(new ExcelData(i+1));
             rowData.add(new ExcelData(dto.getChildNo()));
             rowData.add(new ExcelData(dto.getOwnerUserNo()+""));
+            rowData.add(new ExcelData(settlementWay));
             rowData.add(new ExcelData(dto.getGoodsName()));
-
             rowData.add(new ExcelData(dto.getWeight()));
             rowData.add(new ExcelData(dto.getFreightPrice().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getFreight().movePointLeft(2)));
@@ -220,7 +222,6 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2)));
-
             rowData.add(new ExcelData(dto.getInvoiceTypeMsg()));
             rowData.add(new ExcelData(dto.getOrderNo()));
             rowData.add(new ExcelData(dto.getSettlementNo()));
@@ -228,8 +229,6 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getCreateTime()));
             rowData.add(new ExcelData(dto.getFinalPaymentStatusMsg()));
             rowData.add(new ExcelData(dto.getInvoiceStatusMsg()));
-
-
             dataList.add(rowData);
         }