diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DispatchController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DispatchController.java
index 444c44e5..326673d0 100644
--- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DispatchController.java
+++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DispatchController.java
@@ -161,8 +161,12 @@ public class DispatchController extends ControllerBase {
                             .setCreateTime(LocalDateTime.now())
             );
         }
-        if (!Objects.equals(old.getState(), 2)) {
-            dispatch.setState(request.getPlanStartDate().isBefore(LocalDate.now().plusDays(1)) ? 1 : 0);
+        if (LocalDate.now().isBefore(request.getPlanStartDate())) {
+            dispatch.setState(0);
+        } else if (LocalDate.now().isAfter(request.getPlanEndDate())) {
+            dispatch.setState(2);
+        } else {
+            dispatch.setState(1);
         }
         if (Objects.nonNull(request.getActualStartDate())) {
             dispatch.setActualStartDate(DateTimeUtil.format(request.getActualStartDate(), "yyyy-MM-dd"));
@@ -416,7 +420,7 @@ public class DispatchController extends ControllerBase {
 //            }
             if (ObjectUtil.isNotEmpty(data.getActualEndDate()) && ObjectUtil.isNotEmpty(data.getPlanEndDate())) {
                 data.setIsOntime(LocalDate.parse(data.getActualEndDate(), formatter).isAfter(LocalDate.parse(data.getPlanEndDate(), formatter))
-                ? "否" : (ObjectUtil.isNotEmpty(data.getActualEndDate()) ? "是" : ""));
+                        ? "否" : (ObjectUtil.isNotEmpty(data.getActualEndDate()) ? "是" : ""));
             }
             data.setAssetInfo(data.getCustomerName() + "（" + data.getDeviceNo() + "）");
             return data;