修改监控运单进程接口

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

@@ -1541,16 +1541,19 @@ public class OrderChildServiceImpl implements OrderChildService {
                 //预计到货源地趋势
                 if(orderChildExpect.size() >= 2){
                     OrderChildExpectDTO twoExpect = orderChildExpect.get(1);
-                    if(oneExpect.getExpectArriveTimeSecond() < twoExpect.getExpectArriveTimeSecond()){
-                        monitorOrderChild.setArriveTrend(0);
-                    }else{
-                        monitorOrderChild.setArriveTrend(1);
+                    if(Objects.nonNull(oneExpect.getExpectArriveTimeSecond()) && Objects.nonNull(twoExpect.getExpectArriveTimeSecond())){
+                        if(oneExpect.getExpectArriveTimeSecond() < twoExpect.getExpectArriveTimeSecond()){
+                            monitorOrderChild.setArriveTrend(0);
+                        }else{
+                            monitorOrderChild.setArriveTrend(1);
+                        }
                     }
-
-                    if(oneExpect.getExpectReceiveTimeSecond() < twoExpect.getExpectReceiveTimeSecond()){
-                        monitorOrderChild.setReceiveTrend(0);
-                    }else{
-                        monitorOrderChild.setReceiveTrend(1);
+                    if(Objects.nonNull(oneExpect.getExpectReceiveTimeSecond()) && Objects.nonNull(twoExpect.getExpectReceiveTimeSecond())){
+                        if(oneExpect.getExpectReceiveTimeSecond() < twoExpect.getExpectReceiveTimeSecond()){
+                            monitorOrderChild.setReceiveTrend(0);
+                        }else{
+                            monitorOrderChild.setReceiveTrend(1);
+                        }
                     }
                 }