Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 273dfc2c by chamberone
Options

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

…oject.git into develop
2 parents 058c897a 53763514
Inline Side-by-side
Showing with 6 additions and 10 deletions
project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/ExtractServiceImpl.java
...@@ -293,8 +293,8 @@ public class ExtractServiceImpl implements ExtractService { ...@@ -293,8 +293,8 @@ public class ExtractServiceImpl implements ExtractService {
orderInfo.setEngineerCode(""); orderInfo.setEngineerCode("");
orderInfo.setEngineerName(""); orderInfo.setEngineerName("");
orderInfo.setEngineerPhone(""); orderInfo.setEngineerPhone("");
orderInfo.setPlanStartTime(null); orderInfo.setPlanStartTime(orderInfo.getExpectTimeBegin());
orderInfo.setPlanEndTime(null); orderInfo.setPlanEndTime(orderInfo.getExpectTimeEnd());
orderInfo.setArriveElapsed(0); orderInfo.setArriveElapsed(0);
orderInfo.setArriveDistance(0); orderInfo.setArriveDistance(0);
orderInfo.setAppointmentStatus("INIT"); orderInfo.setAppointmentStatus("INIT");
......
project-order/src/main/java/com/dituhui/pea/order/utils/OrderUtil.java
...@@ -95,8 +95,7 @@ public class OrderUtil { ...@@ -95,8 +95,7 @@ public class OrderUtil {
if (order.getExpectTimeBegin().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) { if (order.getExpectTimeBegin().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
return true; return true;
} }
} } else if (order.getPlanStartTime().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
if (order.getPlanStartTime().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
return true; return true;
} }
return false; return false;
...@@ -120,8 +119,7 @@ public class OrderUtil { ...@@ -120,8 +119,7 @@ public class OrderUtil {
if (order.getExpectTimeEnd().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) { if (order.getExpectTimeEnd().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
return true; return true;
} }
} } else if (order.getPlanEndTime().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
if (order.getPlanEndTime().getTime() + 10 * 60 * 1000 < System.currentTimeMillis()) {
return true; return true;
} }
return false; return false;
...@@ -145,8 +143,7 @@ public class OrderUtil { ...@@ -145,8 +143,7 @@ public class OrderUtil {
if (order.getExpectTimeEnd().plusMinutes(10).isBefore(LocalDateTime.now())) { if (order.getExpectTimeEnd().plusMinutes(10).isBefore(LocalDateTime.now())) {
return true; return true;
} }
} } else if (order.getPlanStartTime().plusMinutes(10).isBefore(LocalDateTime.now())) {
if (order.getPlanStartTime().plusMinutes(10).isBefore(LocalDateTime.now())) {
return true; return true;
} }
return false; return false;
...@@ -170,8 +167,7 @@ public class OrderUtil { ...@@ -170,8 +167,7 @@ public class OrderUtil {
if (order.getExpectTimeEnd().plusMinutes(10).isBefore(LocalDateTime.now())) { if (order.getExpectTimeEnd().plusMinutes(10).isBefore(LocalDateTime.now())) {
return true; return true;
} }
} } else if (order.getPlanEndTime().plusMinutes(10).isBefore(LocalDateTime.now())) {
if (order.getPlanEndTime().plusMinutes(10).isBefore(LocalDateTime.now())) {
return true; return true;
} }
return false; return false;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!