mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-12 03:01:12 +00:00
no message
This commit is contained in:
parent
aa74c5ccaf
commit
6927c0b30b
@ -845,11 +845,12 @@ class ProjectTask extends AbstractModel
|
|||||||
$existAt = $this->start_at && !$clearSubTaskTime;
|
$existAt = $this->start_at && !$clearSubTaskTime;
|
||||||
$newStringAt = $existAt ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : '';
|
$newStringAt = $existAt ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : '';
|
||||||
if ($isOverdue) {
|
if ($isOverdue) {
|
||||||
|
$effectiveEndTime = $existAt ? Carbon::parse($this->end_at)->min(Carbon::now()) : Carbon::now();
|
||||||
$this->addLog("{任务}超期未完成", [
|
$this->addLog("{任务}超期未完成", [
|
||||||
'cache' => [
|
'cache' => [
|
||||||
'task_at' => $oldStringAt,
|
'task_at' => $oldStringAt,
|
||||||
'change_at' => $newStringAt,
|
'change_at' => $newStringAt,
|
||||||
'over_sec' => ($existAt ? $this->end_at : Carbon::now())->diffInSeconds($oldAt[1]),
|
'over_sec' => $effectiveEndTime->diffInSeconds($oldAt[1]),
|
||||||
'owners' => $this->taskUser->where('owner', 1)->pluck('userid')->toArray(),
|
'owners' => $this->taskUser->where('owner', 1)->pluck('userid')->toArray(),
|
||||||
'assists' => $this->taskUser->where('owner', 0)->pluck('userid')->toArray(),
|
'assists' => $this->taskUser->where('owner', 0)->pluck('userid')->toArray(),
|
||||||
]
|
]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user