Merge remote-tracking branch 'origin/test' into test

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

@@ -31,6 +31,7 @@ import com.clx.performance.model.PerformanceProgress;
 import com.clx.performance.model.PerformanceProgressLog;
 import com.clx.performance.param.pc.carrier.PagePerformanceProgress;
 import com.clx.performance.param.pc.carrier.UpdatePerformanceProgressParam;
+import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.PerformanceProgressLogService;
 import com.clx.performance.service.PerformanceProgressService;
 import com.clx.performance.struct.PerformanceProgressLogStruct;
@@ -85,7 +86,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
     private final OrderService orderService;
     private final ThirdAppConfig thirdAppConfig;
     private final OrderFeign orderFeign;
-
+    private final OrderGoodsService orderGoodsService;
     public static List<Integer> inProcessStatusList;
     public static List<Integer> endStatusList ;
     public static List<Integer> allStatusList ;
@@ -451,7 +452,8 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             //最后一个挂单中的货单的挂单时间为最早的挂单时间
             firstPendingTime = item.getPendingOrderTime();
 
-            pendingWeight = pendingWeight.add(item.getExtractWeight());
+            pendingWeight = pendingWeight.add(orderGoodsService.calcOrderGoodsResidueWeight(item.getExtractWeight(),
+                    item.getAlreadyTransportWeight()));
         }
         PerformanceProgress update = new PerformanceProgress();
         update.setId(optional.get().getId());
@@ -567,19 +569,19 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         fieldList.add(new ExcelField(15, "在途车数", "onTheWayTruckNum", 5000));
         fieldList.add(new ExcelField(16, "接单率（%）", "orderedRate", 5000));
         fieldList.add(new ExcelField(17, "任务完成率（%）", "taskCompleteRatio", 5000));
-        fieldList.add(new ExcelField(18, "矿发量（吨）", "sumLoadWeight", 10000));
-        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));
+        fieldList.add(new ExcelField(18, "矿发量（吨）", "sumLoadWeight", 5000));
+        fieldList.add(new ExcelField(19, "到站量（吨）", "sumUnloadWeight", 5000));
+        fieldList.add(new ExcelField(20, "在途量（吨）", "sumOnTheWayWeight", 5000));
+        fieldList.add(new ExcelField(21, "今日预计完成（吨）", "todayExpectComplete", 5000));
+        fieldList.add(new ExcelField(22, "异常备注", "abnormalRemark", 5000));
+        fieldList.add(new ExcelField(23, "履约异常原因", "performanceAbnormalReason", 5000));
+        fieldList.add(new ExcelField(24, "调度备注/跟进措施", "dispatchFollow", 5000));
+        fieldList.add(new ExcelField(25, "重车运距(公里)", "orderDistance", 5000));
+        fieldList.add(new ExcelField(26, "可拉运时间段", "transportTimeSlot", 5000));
+        fieldList.add(new ExcelField(27, "挂单时间", "pendingTime", 5000));
+        fieldList.add(new ExcelField(28, "交易要求到站时间", "tradeRequireArriveStationTime", 5000));
+        fieldList.add(new ExcelField(29, "物流预计到站时间", "transportExpectArriveStationTime", 5000));
+        fieldList.add(new ExcelField(30, "测算运费", "predictionFreightPrice", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -617,7 +619,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             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.getOrderDistance()+""));
             rowData.add(new ExcelData(vo.getTransportTimeSlot()));
             rowData.add(new ExcelData(vo.getPendingTime()));
             rowData.add(new ExcelData(vo.getTradeRequireArriveStationTime()));