正在显示
1 个修改的文件
包含
9 行增加
和
2 行删除
| @@ -35,7 +35,7 @@ class OnlineController extends BaseController | @@ -35,7 +35,7 @@ class OnlineController extends BaseController | ||
| 35 | $query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id') | 35 | $query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id') |
| 36 | ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') | 36 | ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') |
| 37 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') | 37 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') |
| 38 | - ->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id'); | 38 | + ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id'); |
| 39 | $query = $this->searchParam($query); | 39 | $query = $this->searchParam($query); |
| 40 | $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray(); | 40 | $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray(); |
| 41 | if(!empty($lists['list'])){ | 41 | if(!empty($lists['list'])){ |
| @@ -59,7 +59,13 @@ class OnlineController extends BaseController | @@ -59,7 +59,13 @@ class OnlineController extends BaseController | ||
| 59 | */ | 59 | */ |
| 60 | public function selectParam(){ | 60 | public function selectParam(){ |
| 61 | $select = [ | 61 | $select = [ |
| 62 | - 'gl_project.*', | 62 | + 'gl_project.id AS id', |
| 63 | + 'gl_project.title AS title', | ||
| 64 | + 'gl_project.channel AS channel', | ||
| 65 | + 'gl_project.type AS type', | ||
| 66 | + 'gl_project.created_at AS created_at', | ||
| 67 | + 'gl_project_online_check.optimist_status AS optimist_status', | ||
| 68 | + 'gl_project.qa_status AS qa_status', | ||
| 63 | 'gl_project_deploy_build.key AS key', | 69 | 'gl_project_deploy_build.key AS key', |
| 64 | 'gl_project_deploy_build.day AS day', | 70 | 'gl_project_deploy_build.day AS day', |
| 65 | 'gl_project_payment.amount AS amount', | 71 | 'gl_project_payment.amount AS amount', |
| @@ -69,6 +75,7 @@ class OnlineController extends BaseController | @@ -69,6 +75,7 @@ class OnlineController extends BaseController | ||
| 69 | 'gl_project_deploy_build.tech_mid AS tech_mid', | 75 | 'gl_project_deploy_build.tech_mid AS tech_mid', |
| 70 | 'gl_project_deploy_build.test_domain AS test_domain', | 76 | 'gl_project_deploy_build.test_domain AS test_domain', |
| 71 | 'gl_project_deploy_build.plan AS plan', | 77 | 'gl_project_deploy_build.plan AS plan', |
| 78 | + 'gl_project_deploy_build.keyword_num AS keyword_num', | ||
| 72 | 'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid', | 79 | 'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid', |
| 73 | 'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid', | 80 | 'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid', |
| 74 | 'gl_project_deploy_optimize.assist_mid AS optimize_assist_mid', | 81 | 'gl_project_deploy_optimize.assist_mid AS optimize_assist_mid', |
-
请 注册 或 登录 后发表评论