Merge branch 'master' into docker_package
This commit is contained in:
commit
fa0c9f0f61
|
@ -219,9 +219,6 @@ public class TAbilityApplicationController {
|
||||||
index.setDoneReminders(Boolean.FALSE); // 不存在催办记录
|
index.setDoneReminders(Boolean.FALSE); // 不存在催办记录
|
||||||
index.setNextRemindersDays(0); // 距离下次催办天数为0
|
index.setNextRemindersDays(0); // 距离下次催办天数为0
|
||||||
}
|
}
|
||||||
// index.setAllowReminders(Boolean.TRUE); // 允许催办
|
|
||||||
// index.setDoneReminders(Boolean.FALSE); // 不存在催办记录
|
|
||||||
// index.setNextRemindersDays(0); // 距离下次催办天数为0
|
|
||||||
} else { // 进行过催办
|
} else { // 进行过催办
|
||||||
long between = ChronoUnit.DAYS.between(localDate, LocalDate.now()); // 上次催办距离今天已过天数
|
long between = ChronoUnit.DAYS.between(localDate, LocalDate.now()); // 上次催办距离今天已过天数
|
||||||
if (between <= interval) { // 间隔天数小于限制天数
|
if (between <= interval) { // 间隔天数小于限制天数
|
||||||
|
@ -239,7 +236,6 @@ public class TAbilityApplicationController {
|
||||||
index.setDoneReminders(Boolean.FALSE);
|
index.setDoneReminders(Boolean.FALSE);
|
||||||
index.setNextRemindersDays(0);
|
index.setNextRemindersDays(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
return index;
|
return index;
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
page.setList(list);
|
page.setList(list);
|
||||||
|
|
Loading…
Reference in New Issue