From b2cbba08f2d2ab4286edc734ba9cc67d55b64ccb Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 30 Jan 2023 15:24:14 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=B7=A5=E4=BD=9C=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/ReportController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '
  •  
    • ';