导出履约进度

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

@@ -571,6 +571,15 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         fieldList.add(new ExcelField(19, "到站量（吨）", "sumUnloadWeight", 10000));
         fieldList.add(new ExcelField(20, "在途量（吨）", "sumOnTheWayWeight", 10000));
         fieldList.add(new ExcelField(21, "今日预计完成（吨）", "todayExpectComplete", 10000));
+        fieldList.add(new ExcelField(22, "异常备注", "abnormalRemark", 10000));
+        fieldList.add(new ExcelField(23, "履约异常原因", "performanceAbnormalReason", 10000));
+        fieldList.add(new ExcelField(24, "调度备注/跟进措施", "dispatchFollow", 10000));
+        fieldList.add(new ExcelField(25, "重车运距(公里)", "orderDistance", 10000));
+        fieldList.add(new ExcelField(26, "可拉运时间段", "transportTimeSlot", 10000));
+        fieldList.add(new ExcelField(27, "挂单时间", "pendingTime", 10000));
+        fieldList.add(new ExcelField(28, "交易要求到站时间", "tradeRequireArriveStationTime", 10000));
+        fieldList.add(new ExcelField(29, "物流预计到站时间", "transportExpectArriveStationTime", 10000));
+        fieldList.add(new ExcelField(30, "测算运费", "predictionFreightPrice", 10000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -605,6 +614,16 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             rowData.add(new ExcelData(vo.getSumOnTheWayWeight()));
             rowData.add(new ExcelData(vo.getTodayExpectComplete()));
 
+            rowData.add(new ExcelData(vo.getAbnormalRemark()));
+            rowData.add(new ExcelData(vo.getPerformanceAbnormalReason()));
+            rowData.add(new ExcelData(vo.getDispatchFollow()));
+            rowData.add(new ExcelData(vo.getOrderDistance()));
+            rowData.add(new ExcelData(vo.getTransportTimeSlot()));
+            rowData.add(new ExcelData(vo.getPendingTime()));
+            rowData.add(new ExcelData(vo.getTradeRequireArriveStationTime()));
+            rowData.add(new ExcelData(vo.getTransportExpectArriveStationTime()));
+            rowData.add(new ExcelData(vo.getPredictionFreightPrice()==null?null:vo.getPredictionFreightPrice().movePointLeft(2)));
+
             dataList.add(rowData);
         }