gx

@@ -39,6 +39,13 @@ class OptimizationReportController extends BaseController
      * @time   :2024/3/7 15:54
      * @time   :2024/3/7 15:54
      */
      */
     public function getOptimizationReport(){
     public function getOptimizationReport(){
+        $this->request->validate([
+            'project_id' => 'required',
+            'date'=>'required',
+        ], [
+            'project_id.required' => '项目id不能为空',
+            'date.required' => '时间不能为空',
+        ]);
         ProjectServer::useProject($this->param['project_id']);
         ProjectServer::useProject($this->param['project_id']);
         $data = [];
         $data = [];
         $projectModel = new Project();
         $projectModel = new Project();
@@ -55,6 +62,7 @@ class OptimizationReportController extends BaseController
                 'cert_info' => date('Y-m-d', strtotime($domain_info['certificate_start_time'])) . ' - ' .date('Y-m-d', strtotime($domain_info['certificate_end_time'])),
                 'cert_info' => date('Y-m-d', strtotime($domain_info['certificate_start_time'])) . ' - ' .date('Y-m-d', strtotime($domain_info['certificate_end_time'])),
             ];
             ];
         }
         }
+        $data['domain'] = $domain_info;
         //方案信息
         //方案信息
         $data['plan_information'] = $this->plan_information($projectInfo);
         $data['plan_information'] = $this->plan_information($projectInfo);
         //排名数据
         //排名数据

@@ -39,6 +39,7 @@ class SuppliersController extends BaseController
             foreach ($lists as $v){
             foreach ($lists as $v){
                 $resultData = json_decode($v['data']);
                 $resultData = json_decode($v['data']);
                 foreach ($resultData as $value){
                 foreach ($resultData as $value){
+                    $value['keyword'] = $v['keyword'];
                     $data[] = $value;
                     $data[] = $value;
                 }
                 }
             }
             }