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 14:36:55 +08:00
parent faee173200 8d4fcf5ddc
commit cdbae9579f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,13 +161,13 @@ public class DispatchController extends ControllerBase {
.setCreateTime(LocalDateTime.now()) .setCreateTime(LocalDateTime.now())
); );
} }
if (!Objects.equals(old.getState(), 2)) {
if (LocalDate.now().isBefore(request.getPlanStartDate())) { if (LocalDate.now().isBefore(request.getPlanStartDate())) {
dispatch.setState(0); dispatch.setState(0);
} else if (LocalDate.now().isAfter(request.getPlanEndDate())) {
dispatch.setState(2);
} else { } else {
dispatch.setState(1); 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"));
} else { } else {