Merge branch 'prod/20260409' into test

This commit is contained in:
曹鹏飞 2026-04-09 14:36:55 +08:00
commit cdbae9579f
1 changed files with 6 additions and 6 deletions

View File

@ -161,12 +161,12 @@ public class DispatchController extends ControllerBase {
.setCreateTime(LocalDateTime.now())
);
}
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.equals(old.getState(), 2)) {
if (LocalDate.now().isBefore(request.getPlanStartDate())) {
dispatch.setState(0);
} else {
dispatch.setState(1);
}
}
if (Objects.nonNull(request.getActualStartDate())) {
dispatch.setActualStartDate(DateTimeUtil.format(request.getActualStartDate(), "yyyy-MM-dd"));