Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/ExtractServiceImpl.java

@@ -293,8 +293,8 @@ public class ExtractServiceImpl implements ExtractService {
                 orderInfo.setEngineerCode("");
                 orderInfo.setEngineerName("");
                 orderInfo.setEngineerPhone("");
-                orderInfo.setPlanStartTime(null);
-                orderInfo.setPlanEndTime(null);
+                orderInfo.setPlanStartTime(orderInfo.getExpectTimeBegin());
+                orderInfo.setPlanEndTime(orderInfo.getExpectTimeEnd());
                 orderInfo.setArriveElapsed(0);
                 orderInfo.setArriveDistance(0);
                 orderInfo.setAppointmentStatus("INIT");

project-order/src/main/java/com/dituhui/pea/order/utils/OrderUtil.java

@@ -95,8 +95,7 @@ public class OrderUtil {
             if (order.getExpectTimeBegin().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
                 return true;
             }
-        }
-        if (order.getPlanStartTime().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
+        } else if (order.getPlanStartTime().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
             return true;
         }
         return false;
@@ -120,8 +119,7 @@ public class OrderUtil {
             if (order.getExpectTimeEnd().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
                 return true;
             }
-        }
-        if (order.getPlanEndTime().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
+        } else if (order.getPlanEndTime().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
             return true;
         }
         return false;
@@ -145,8 +143,7 @@ public class OrderUtil {
             if (order.getExpectTimeEnd().plusMinutes(10).isBefore(LocalDateTime.now())) {
                 return true;
             }
-        }
-        if (order.getPlanStartTime().plusMinutes(10).isBefore(LocalDateTime.now())) {
+        } else if (order.getPlanStartTime().plusMinutes(10).isBefore(LocalDateTime.now())) {
             return true;
         }
         return false;
@@ -170,8 +167,7 @@ public class OrderUtil {
             if (order.getExpectTimeEnd().plusMinutes(10).isBefore(LocalDateTime.now())) {
                 return true;
             }
-        }
-        if (order.getPlanEndTime().plusMinutes(10).isBefore(LocalDateTime.now())) {
+        } else if (order.getPlanEndTime().plusMinutes(10).isBefore(LocalDateTime.now())) {
             return true;
         }
         return false;