From 877fb3b624e16ae8fbd21aaad2eb61349e256e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 9 Apr 2026 11:30:40 +0800 Subject: [PATCH] =?UTF-8?q?bug-1419=20=E6=B4=BE=E5=B7=A5=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=90=8E=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gongfu/controller/DispatchController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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;