diff --git a/app/Http/Controllers/Api/ReportController.php b/app/Http/Controllers/Api/ReportController.php index 663f34d09..472519951 100755 --- a/app/Http/Controllers/Api/ReportController.php +++ b/app/Http/Controllers/Api/ReportController.php @@ -306,7 +306,7 @@ class ReportController extends AbstractController foreach ($complete_task as $task) { $complete_at = Carbon::parse($task->complete_at); $pre = $type == Report::WEEKLY ? ('[' . Base::Lang('周' . ['日', '一', '二', '三', '四', '五', '六'][$complete_at->dayOfWeek]) . '] ') : ''; - $completeContent .= '
  • ' . $pre . $task->name . '
  • '; + $completeContent .= "
  • {$pre}[{$task->project->name}] {$task->name}
  • "; } } else { $completeContent = '
  •  
  • '; @@ -327,7 +327,7 @@ class ReportController extends AbstractController foreach ($unfinished_task as $task) { empty($task->end_at) || $end_at = Carbon::parse($task->end_at); $pre = (!empty($end_at) && $end_at->lt($now_dt)) ? '[' . Base::Lang('超期') . '] ' : ''; - $unfinishedContent .= '
  • ' . $pre . $task->name . '
  • '; + $unfinishedContent .= "
  • {$pre}[{$task->project->name}] {$task->name}
  • "; } } else { $unfinishedContent = '
  •  
  • ';