。。。
This commit is contained in:
parent
77185be5c1
commit
4b724593c6
|
@ -370,6 +370,7 @@ public class TAbilityApplicationController {
|
||||||
AtomicReference<Boolean> allowReminders = new AtomicReference<>(Boolean.FALSE); // 是否允许催办
|
AtomicReference<Boolean> allowReminders = new AtomicReference<>(Boolean.FALSE); // 是否允许催办
|
||||||
AtomicReference<Boolean> doneReminders = new AtomicReference<>(Boolean.FALSE); // 是否已执行过催办
|
AtomicReference<Boolean> doneReminders = new AtomicReference<>(Boolean.FALSE); // 是否已执行过催办
|
||||||
AtomicReference<Integer> nextRemindersDays = new AtomicReference<>(0); // 下次催办多少天后
|
AtomicReference<Integer> nextRemindersDays = new AtomicReference<>(0); // 下次催办多少天后
|
||||||
|
|
||||||
taskHandleDetailInfo = taskHandleDetailInfo.stream().map(index_ -> { // 补充审核人部门名称
|
taskHandleDetailInfo = taskHandleDetailInfo.stream().map(index_ -> { // 补充审核人部门名称
|
||||||
if (StringUtils.isNumeric(index_.getAssignee())) {
|
if (StringUtils.isNumeric(index_.getAssignee())) {
|
||||||
SysUserDTO userDTO = sysUserService.get(Long.valueOf(index_.getAssignee()));
|
SysUserDTO userDTO = sysUserService.get(Long.valueOf(index_.getAssignee()));
|
||||||
|
@ -392,6 +393,7 @@ public class TAbilityApplicationController {
|
||||||
.stream()
|
.stream()
|
||||||
.findFirst(); // 尝试获取当前task
|
.findFirst(); // 尝试获取当前task
|
||||||
if (nowTask.isPresent() && nowTask.get().getId().equals(index_.getTaskId())) { // 存在正在进行的任务
|
if (nowTask.isPresent() && nowTask.get().getId().equals(index_.getTaskId())) { // 存在正在进行的任务
|
||||||
|
logger.info("该流程最新task:" + nowTask.get().getId());
|
||||||
LocalDate localDate = tRemindersService.selectRemindersTime(nowTask.get().getId());
|
LocalDate localDate = tRemindersService.selectRemindersTime(nowTask.get().getId());
|
||||||
if (localDate == null) { // 最新流程未进行过催办
|
if (localDate == null) { // 最新流程未进行过催办
|
||||||
allowReminders.set(Boolean.TRUE);
|
allowReminders.set(Boolean.TRUE);
|
||||||
|
@ -419,9 +421,9 @@ public class TAbilityApplicationController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
allowReminders.set(Boolean.FALSE);
|
// allowReminders.set(Boolean.FALSE);
|
||||||
doneReminders.set(Boolean.FALSE);
|
// doneReminders.set(Boolean.FALSE);
|
||||||
nextRemindersDays.set(0);
|
// nextRemindersDays.set(0);
|
||||||
index_.setAllowReminders(Boolean.FALSE);
|
index_.setAllowReminders(Boolean.FALSE);
|
||||||
index_.setDoneReminders(Boolean.FALSE);
|
index_.setDoneReminders(Boolean.FALSE);
|
||||||
index_.setNextRemindersDays(0);
|
index_.setNextRemindersDays(0);
|
||||||
|
|
Loading…
Reference in New Issue