作者 赵彬吉

update

@@ -589,29 +589,42 @@ class ProjectController extends BaseController @@ -589,29 +589,42 @@ class ProjectController extends BaseController
589 $query->where('company', 'like', '%' . $company . '%'); 589 $query->where('company', 'like', '%' . $company . '%');
590 } 590 }
591 })->orderBy('id', 'desc')->paginate($size)->toArray(); 591 })->orderBy('id', 'desc')->paginate($size)->toArray();
  592 + $list = [];
592 foreach ($data['list'] as $item){ 593 foreach ($data['list'] as $item){
593 - $item['type_text'] = Project::typeMap()[$item['type']] ?? '';  
594 - $item['plan_text'] = Project::planMap()[$item['deploy_build']['plan']] ?? '';  
595 - $item['start_date'] = $item['deploy_optimize']['start_date'] ?? '';  
596 - $item['domain'] = $item['deploy_optimize']['domain'] ?? '';  
597 - $item['test_domain'] = $item['deploy_build']['test_domain'] ?? '';  
598 - $item['online_time'] = $item['online_check']['qa_check_time'] ?? ''; 594 + $param = [
  595 + "id" => $item['id'],
  596 + "title" => $item['title'],
  597 + "type" => $item['type'],
  598 + "type_text" => Project::typeMap()[$item['type']] ?? '',
  599 + "channel" => $item['channel'],
  600 + "created_at" => $item['created_at'],
  601 + "updated_at" => $item['updated_at'],
  602 + "post_id" => $item['post_id'],
  603 + "from_order_id" => $item['from_order_id'],
  604 + "remain_day" => $item['remain_day'],
  605 + "last_inquiry_time" => $item['last_inquiry_time'],
  606 + "online_check" => $item['remain_day'],
  607 + "plan" => $item['deploy_build']['plan'] ?: 0,
  608 + "plan_text" => Project::planMap()[$item['deploy_build']['plan']] ?? '',
  609 + "start_date" => $item['deploy_optimize']['start_date'] ?? '',
  610 + "domain" => $item['deploy_optimize']['domain'] ?? '',
  611 + "test_domain" => $item['deploy_build']['test_domain'] ?? '',
  612 + "online_time" => $item['online_check']['qa_check_time'] ?? '',
  613 + ];
599 if ($item['type'] == 3) { 614 if ($item['type'] == 3) {
600 - $item['is_compliance'] = RankData::where('project_id', $item['id'])->where('lang', '')->value('is_compliance') ?: 0; 615 + $param['is_compliance'] = RankData::where('project_id', $item['id'])->where('lang', '')->value('is_compliance') ?: 0;
601 } else { 616 } else {
602 - $item['is_compliance'] = 1; 617 + $param['is_compliance'] = 1;
603 } 618 }
604 $yesterday_count = Count::where('project_id', $item['id'])->where('date', date('Y-m-d', strtotime('-1 day')))->first(); 619 $yesterday_count = Count::where('project_id', $item['id'])->where('date', date('Y-m-d', strtotime('-1 day')))->first();
605 $today_count = Count::where('project_id', $item['id'])->where('date', date('Y-m-d'))->first(); 620 $today_count = Count::where('project_id', $item['id'])->where('date', date('Y-m-d'))->first();
606 - $item['yesterday_ip_count'] = $yesterday_count['ip_num'] ?? 0;  
607 - $item['to_ip_count'] = $today_count['ip_num'] ?? 0;  
608 - $item['inquiry_num'] = $today_count['inquiry_num'] ?? 0; 621 + $param['yesterday_ip_count'] = $yesterday_count['ip_num'] ?? 0;
  622 + $param['to_ip_count'] = $today_count['ip_num'] ?? 0;
  623 + $param['inquiry_num'] = $today_count['inquiry_num'] ?? 0;
609 624
610 - unset($item['deploy_build']);  
611 - unset($item['deploy_optimize']);  
612 - unset($item['online_check']); 625 + $list[] = $param;
613 } 626 }
614 627
615 - $this->response('success',Code::SUCCESS, $data); 628 + $this->response('success',Code::SUCCESS, $list);
616 } 629 }
617 } 630 }