mirror of
https://github.com/kuaifan/dootask.git
synced 2026-02-14 11:23:50 +00:00
fix: align parent task subtask progress with task detail (include archived, exclude deleted)
This commit is contained in:
parent
203d107d68
commit
0b7a3046fe
@ -1184,6 +1184,7 @@ class ProjectController extends AbstractController
|
||||
$builder->leftJoinSub(function ($query) {
|
||||
$query->select('parent_id', DB::raw('count(*) as sub_num, sum(CASE WHEN complete_at IS NOT NULL THEN 1 ELSE 0 END) sub_complete') )
|
||||
->from('project_tasks')
|
||||
->whereNull('deleted_at')
|
||||
->groupBy('parent_id');
|
||||
}, 'sub_task', 'sub_task.parent_id', '=', 'project_tasks.id');
|
||||
// 给前缀“_”是为了不触发获取器
|
||||
|
||||
@ -156,7 +156,7 @@ class ProjectTask extends AbstractModel
|
||||
return;
|
||||
}
|
||||
if (!isset($this->appendattrs['sub_num'])) {
|
||||
$builder = self::whereParentId($this->id)->whereNull('archived_at');
|
||||
$builder = self::whereParentId($this->id);
|
||||
$this->appendattrs['sub_num'] = $builder->count();
|
||||
$this->appendattrs['sub_complete'] = $builder->whereNotNull('complete_at')->count();
|
||||
//
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user