Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 8209c528 by huangjinxin
Options

fix：工单状态判断

1 parent ffff7474
Inline Side-by-side
Showing with 4 additions and 4 deletions
project-order/src/main/java/com/dituhui/pea/order/utils/OrderUtil.java
...@@ -85,7 +85,7 @@ public class OrderUtil { ...@@ -85,7 +85,7 @@ public class OrderUtil {
* @return * @return
*/ */
public static Boolean isDelay(OrderInfo order) { public static Boolean isDelay(OrderInfo order) {
if (order.getDt().isBefore(LocalDate.now())) { if (order.getDt().isAfter(LocalDate.now())) {
return false; return false;
} }
if (!order.getServiceStatus().equals(ServiceStatusEnum.INIT.getCode()) && !order.getServiceStatus().equals(ServiceStatusEnum.CONTACTED.getCode())) { if (!order.getServiceStatus().equals(ServiceStatusEnum.INIT.getCode()) && !order.getServiceStatus().equals(ServiceStatusEnum.CONTACTED.getCode())) {
...@@ -109,7 +109,7 @@ public class OrderUtil { ...@@ -109,7 +109,7 @@ public class OrderUtil {
* @return * @return
*/ */
public static Boolean isOvertime(OrderInfo order) { public static Boolean isOvertime(OrderInfo order) {
if (order.getDt().isBefore(LocalDate.now())) { if (order.getDt().isAfter(LocalDate.now())) {
return false; return false;
} }
if (!order.getServiceStatus().equals(ServiceStatusEnum.STARTED.getCode()) || ObjectUtil.isNotNull(order.getActualEndTime())) { if (!order.getServiceStatus().equals(ServiceStatusEnum.STARTED.getCode()) || ObjectUtil.isNotNull(order.getActualEndTime())) {
...@@ -133,7 +133,7 @@ public class OrderUtil { ...@@ -133,7 +133,7 @@ public class OrderUtil {
* @return * @return
*/ */
public static Boolean isDelay(OrderInfoEntity order) { public static Boolean isDelay(OrderInfoEntity order) {
if (order.getDt().isBefore(LocalDate.now())) { if (order.getDt().isAfter(LocalDate.now())) {
return false; return false;
} }
if (!order.getServiceStatus().equals(ServiceStatusEnum.INIT.getCode()) && !order.getServiceStatus().equals(ServiceStatusEnum.CONTACTED.getCode())) { if (!order.getServiceStatus().equals(ServiceStatusEnum.INIT.getCode()) && !order.getServiceStatus().equals(ServiceStatusEnum.CONTACTED.getCode())) {
...@@ -157,7 +157,7 @@ public class OrderUtil { ...@@ -157,7 +157,7 @@ public class OrderUtil {
* @return * @return
*/ */
public static Boolean isOvertime(OrderInfoEntity order) { public static Boolean isOvertime(OrderInfoEntity order) {
if (order.getDt().isBefore(LocalDate.now())) { if (order.getDt().isAfter(LocalDate.now())) {
return false; return false;
} }
if (!order.getServiceStatus().equals(ServiceStatusEnum.STARTED.getCode()) || ObjectUtil.isNotNull(order.getActualEndTime())) { if (!order.getServiceStatus().equals(ServiceStatusEnum.STARTED.getCode()) || ObjectUtil.isNotNull(order.getActualEndTime())) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!