mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-12 11:19:56 +00:00
feat: 优化自动归档逻辑
- 子任务不自动归档
This commit is contained in:
parent
3cf7055122
commit
7011c81bcd
@ -42,6 +42,7 @@ class AutoArchivedTask extends AbstractTask
|
|||||||
->whereNotNull('project_tasks.complete_at')
|
->whereNotNull('project_tasks.complete_at')
|
||||||
->where('project_tasks.complete_at', '<=', Carbon::now()->subDays($archivedDay))
|
->where('project_tasks.complete_at', '<=', Carbon::now()->subDays($archivedDay))
|
||||||
->where('project_tasks.archived_userid', 0)
|
->where('project_tasks.archived_userid', 0)
|
||||||
|
->where('project_tasks.parent_id', 0)
|
||||||
->whereNull('project_tasks.archived_at')
|
->whereNull('project_tasks.archived_at')
|
||||||
->where('projects.archive_method', '!=', 'custom')
|
->where('projects.archive_method', '!=', 'custom')
|
||||||
->take(100)
|
->take(100)
|
||||||
@ -63,6 +64,7 @@ class AutoArchivedTask extends AbstractTask
|
|||||||
->join('projects', 'projects.id', '=', 'project_tasks.project_id')
|
->join('projects', 'projects.id', '=', 'project_tasks.project_id')
|
||||||
->whereNotNull('project_tasks.complete_at')
|
->whereNotNull('project_tasks.complete_at')
|
||||||
->where('project_tasks.archived_userid', 0)
|
->where('project_tasks.archived_userid', 0)
|
||||||
|
->where('project_tasks.parent_id', 0)
|
||||||
->whereNull('project_tasks.archived_at')
|
->whereNull('project_tasks.archived_at')
|
||||||
->where('projects.archive_method', 'custom')
|
->where('projects.archive_method', 'custom')
|
||||||
->whereRaw("DATEDIFF(NOW(), {$prefix}project_tasks.complete_at) >= {$prefix}projects.archive_days")
|
->whereRaw("DATEDIFF(NOW(), {$prefix}project_tasks.complete_at) >= {$prefix}projects.archive_days")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user