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

Merge branch 'prod/20260409' into test

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

8
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"));