diff --git a/app/Http/Controllers/Api/ReportController.php b/app/Http/Controllers/Api/ReportController.php index 046f926a8..db479bbb5 100755 --- a/app/Http/Controllers/Api/ReportController.php +++ b/app/Http/Controllers/Api/ReportController.php @@ -340,14 +340,19 @@ class ReportController extends AbstractController } else { $title = $user->nickname . "的日报[" . $start_time->format("Y/m/d") . "]"; } + // 生成内容 + $content = '

' . Base::Lang('已完成工作') . '

    ' . + $completeContent . '

' . + Base::Lang('未完成的工作') . '

    ' . + $unfinishedContent . '
'; + if ($type === Report::WEEKLY) { + $content .= "

" . Base::Lang("下周拟定计划") . "[" . $start_time->addWeek()->format("m/d") . "-" . $end_time->addWeek()->format("m/d") . "]

  1.  
"; + } $data = [ "time" => $start_time->toDateTimeString(), "sign" => $sign, "title" => $title, - "content" => '

' . Base::Lang('已完成工作') . '

    ' . - $completeContent . '

' . - Base::Lang('未完成的工作') . '

    ' . - $unfinishedContent . '
', + "content" => $content, "complete_task" => $complete_task, "unfinished_task" => $unfinished_task, ];