rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug-1419 派工单修改后重新计算状态

This commit is contained in:
曹鹏飞 2026-04-09 11:30:40 +08:00
parent b3c625ce72
commit 877fb3b624
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DispatchController.java
View File

@ -161,8 +161,12 @@ public class DispatchController extends ControllerBase {
.setCreateTime(LocalDateTime.now()) .setCreateTime(LocalDateTime.now())
); );
} }
if (!Objects.equals(old.getState(), 2)) { if (LocalDate.now().isBefore(request.getPlanStartDate())) {
dispatch.setState(request.getPlanStartDate().isBefore(LocalDate.now().plusDays(1)) ? 1 : 0); dispatch.setState(0);
} else if (LocalDate.now().isAfter(request.getPlanEndDate())) {
dispatch.setState(2);
} else {
dispatch.setState(1);
} }
if (Objects.nonNull(request.getActualStartDate())) { if (Objects.nonNull(request.getActualStartDate())) {
dispatch.setActualStartDate(DateTimeUtil.format(request.getActualStartDate(), "yyyy-MM-dd")); 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())) { if (ObjectUtil.isNotEmpty(data.getActualEndDate()) && ObjectUtil.isNotEmpty(data.getPlanEndDate())) {
data.setIsOntime(LocalDate.parse(data.getActualEndDate(), formatter).isAfter(LocalDate.parse(data.getPlanEndDate(), formatter)) 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() + "）"); data.setAssetInfo(data.getCustomerName() + "（" + data.getDeviceNo() + "）");
return data; return data;