diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index cee42db7..9bc4e1e7 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -621,7 +621,7 @@ class ProjectController extends AbstractController return Base::retError('项目不存在或不在成员列表内'); } // - $data = ProjectTask::with(['taskUser', 'taskTag'])->where('parent_id', $task->id)->get(); + $data = ProjectTask::with(['taskUser', 'taskTag'])->where('parent_id', $task->id)->whereNull('archived_at')->get(); return Base::retSuccess('success', $data); } diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index f9ad4a32..2638d207 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -117,11 +117,11 @@ class ProjectTask extends AbstractModel if ($this->parent_id > 0) { $this->attributes['sub_num'] = 0; $this->attributes['sub_complete'] = 0; - $this->attributes['percent'] = 0; + $this->attributes['percent'] = $this->complete_at ? 100 : 0; return; } if (!isset($this->attributes['sub_num'])) { - $builder = self::whereParentId($this->id); + $builder = self::whereParentId($this->id)->whereNull('archived_at'); $this->attributes['sub_num'] = $builder->count(); $this->attributes['sub_complete'] = $builder->whereNotNull('complete_at')->count(); //