增加挂单运费列表和导出接口

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

@@ -229,49 +229,48 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
         List<ExcelField> fieldList = new ArrayList<>();
 
         fieldList.add(new ExcelField(0, "序号", "seq", 5000));
-        fieldList.add(new ExcelField(1, "货源地", "orderNo", 5000));
-        fieldList.add(new ExcelField(2, "煤源位置", "orderSourceMsg", 5000));
-        fieldList.add(new ExcelField(3, "物流经理", "sendAddressShorter", 5000));
-        fieldList.add(new ExcelField(4, "货物名称", "receiveAddressShorter", 5000));
-
-        fieldList.add(new ExcelField(5, "热值", "goodsName", 5000));
-        fieldList.add(new ExcelField(6, "是否C类煤源", "extractWeight", 5000));
-        fieldList.add(new ExcelField(7, "任务吨数(吨)", "alreadyTransportWeight", 5000));
-        fieldList.add(new ExcelField(8, "接单率", "residueTransportWeight", 5000));
-        fieldList.add(new ExcelField(9, "装车率", "alreadyLoadWeight", 5000));
-
-        fieldList.add(new ExcelField(10, "重车运距(公里)", "createTime", 5000));
-        fieldList.add(new ExcelField(11, "煤源地开支（元）", "orderGoodsStatus", 5000));
-        fieldList.add(new ExcelField(12, "历史运费（元）", "orderGoodsStatus", 5000));
-        fieldList.add(new ExcelField(13, "历史平均运费（元）", "orderGoodsStatus", 5000));
-        fieldList.add(new ExcelField(14, "测算运费（元）", "orderGoodsStatus", 5000));
-        fieldList.add(new ExcelField(15, "物流运费（元）", "orderGoodsStatus", 5000));
-        fieldList.add(new ExcelField(16, "挂单运费", "orderGoodsStatus", 5000));
+        fieldList.add(new ExcelField(1, "货源地", "sendAddressShorter", 5000));
+        fieldList.add(new ExcelField(2, "煤源位置", "sendAddress", 5000));
+        fieldList.add(new ExcelField(3, "物流经理", "seniorLogisticsManagerName", 5000));
+        fieldList.add(new ExcelField(4, "货物名称", "goodsName", 5000));
+        fieldList.add(new ExcelField(5, "热值", "goodsTypeName", 5000));
+        fieldList.add(new ExcelField(6, "是否C类煤源", "sendOverStandardMsg", 5000));
+        fieldList.add(new ExcelField(7, "任务吨数(吨)", "taskWeight", 5000));
+        fieldList.add(new ExcelField(8, "接单率", "orderedRate", 5000));
+        fieldList.add(new ExcelField(9, "装车率", "loadTruckRate", 5000));
+        fieldList.add(new ExcelField(10, "重车运距(公里)", "orderDistance", 5000));
+        fieldList.add(new ExcelField(11, "煤源地开支（元）", "sendAddressExpenses", 5000));
+        fieldList.add(new ExcelField(12, "历史运费（元）", "historyFreight", 5000));
+        fieldList.add(new ExcelField(13, "历史平均运费（元）", "historyAvgFreight", 5000));
+        fieldList.add(new ExcelField(14, "测算运费（元）", "predictionFreightPrice", 5000));
+        fieldList.add(new ExcelField(15, "物流运费（元）", "logisticsFreight", 5000));
+        fieldList.add(new ExcelField(16, "挂单运费", "pendingFreight", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
-  /*      for (PagePendingFreightVO vo : list) {
+        for (int i=0; i<list.size(); i++){
             List<ExcelData> rowData = new ArrayList<>();
-            rowData.add(new ExcelData(vo.getOrderGoodsNo()));
-            rowData.add(new ExcelData(vo.getOrderNo()));
-            rowData.add(new ExcelData(vo.getOrderSourceMsg(), "-"));
-            rowData.add(new ExcelData(vo.getSendAddressShorter()));
-            rowData.add(new ExcelData(vo.getReceiveAddressShorter()));
-
-            rowData.add(new ExcelData(vo.getGoodsName()));
-            rowData.add(new ExcelData(vo.getExtractWeight()));
-            rowData.add(new ExcelData(vo.getAlreadyTransportWeight()));
-            rowData.add(new ExcelData(vo.getResidueTransportWeight()));
-            rowData.add(new ExcelData(vo.getAlreadyLoadWeight()));
-
-            rowData.add(new ExcelData(vo.getCreateTime()));
-            rowData.add(new ExcelData(OrderGoodsStatusEnum.Status.getMsgByCode(vo.getOrderGoodsStatus())));
-
+            PagePendingFreightVO vo = list.get(i);
+            rowData.add(new ExcelData(i+1));
+            rowData.add(new ExcelData(vo.getSendAddressShorter(),"-"));
+            rowData.add(new ExcelData(vo.getSendAddress(),"-"));
+            rowData.add(new ExcelData(vo.getSeniorLogisticsManagerName(),"-"));
+            rowData.add(new ExcelData(vo.getGoodsName(), "-"));
+            rowData.add(new ExcelData(vo.getGoodsTypeName(), "-"));
+            rowData.add(new ExcelData(vo.getSendOverStandardMsg(), "-"));
+            rowData.add(new ExcelData(vo.getTaskWeight(), "-"));
+            rowData.add(new ExcelData(vo.getOrderedRate(), "-"));
+            rowData.add(new ExcelData(vo.getLoadTruckRate(), "-"));
+            rowData.add(new ExcelData(vo.getOrderDistance(), "-"));
+            rowData.add(new ExcelData(vo.getSendAddressExpenses(), "-"));
+            rowData.add(new ExcelData(vo.getHistoryFreight(), "-"));
+            rowData.add(new ExcelData(vo.getHistoryAvgFreight(), "-"));
+            rowData.add(new ExcelData(vo.getPredictionFreightPrice(), "-"));
+            rowData.add(new ExcelData(vo.getLogisticsFreight(), "-"));
+            rowData.add(new ExcelData(""));
             dataList.add(rowData);
         }
-*/
-
-        ExcelSheet excelSheet = new ExcelSheet("货单明细", "货单明细", fieldList, dataList);
+        ExcelSheet excelSheet = new ExcelSheet("挂单运费表", "挂单运费表", fieldList, dataList);
 
         //创建excel
         return ExcelUtil.create(excelSheet);