Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 自动归档已完成任务

Browse Source
This commit is contained in:
kuaifan
2022-01-06 01:12:21 +08:00
parent 369577a2c8
commit 7c64b27ef4
6 changed files with 106 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Models/ProjectTask.php
View File

@@ -765,9 +765,9 @@ class ProjectTask extends AbstractModel
* @param Carbon|null $archived_at 归档时间
* @return bool
*/
public function archivedTask($archived_at)
public function archivedTask($archived_at, $isAuto = false)
{
AbstractModel::transaction(function () use ($archived_at) {
AbstractModel::transaction(function () use ($isAuto, $archived_at) {
if ($archived_at === null) {
// 取消归档
$this->archived_at = null;
@@ -775,14 +775,21 @@ class ProjectTask extends AbstractModel
$this->addLog("任务取消归档：" . $this->name);
$this->pushMsg('add', [
'new_column' => null,
'task' => ProjectTask::with(['taskUser', 'taskTag'])->find($this->id),
'task' => ProjectTask::oneTask($this->id),
]);
} else {
// 归档任务
if ($isAuto === true) {
$logText = "自动任务归档：" . $this->name;
$userid = 0;
} else {
$logText = "任务归档：" . $this->name;
$userid = User::userid();
}
$this->archived_at = $archived_at;
$this->archived_userid = User::userid();
$this->archived_userid = $userid;
$this->archived_follow = 0;
$this->addLog("任务归档：" . $this->name);
$this->addLog($logText, $userid);
$this->pushMsg('archived');
}
$this->save();