|
@@ -31,7 +31,8 @@ class OptimizeController extends BaseController |
|
@@ -31,7 +31,8 @@ class OptimizeController extends BaseController |
|
31
|
public function lists(Project $project){
|
31
|
public function lists(Project $project){
|
|
32
|
$query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
|
32
|
$query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
|
|
33
|
->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
|
33
|
->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
|
|
34
|
- ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id');
|
34
|
+ ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
|
|
|
|
35
|
+ ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
|
|
35
|
$query = $this->searchParam($query);
|
36
|
$query = $this->searchParam($query);
|
|
36
|
$lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
|
37
|
$lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
|
|
37
|
if(!empty($lists['list'])){
|
38
|
if(!empty($lists['list'])){
|
|
@@ -93,6 +94,10 @@ class OptimizeController extends BaseController |
|
@@ -93,6 +94,10 @@ class OptimizeController extends BaseController |
|
93
|
'gl_project.type AS type',
|
94
|
'gl_project.type AS type',
|
|
94
|
'gl_project.created_at AS created_at',
|
95
|
'gl_project.created_at AS created_at',
|
|
95
|
'gl_project.cooperate_date AS cooperate_date',
|
96
|
'gl_project.cooperate_date AS cooperate_date',
|
|
|
|
97
|
+ 'gl_project_online_check.id AS online_check_id',
|
|
|
|
98
|
+ 'gl_project_online_check.question AS question',
|
|
|
|
99
|
+ 'gl_project_online_check.optimist_status AS optimist_status',
|
|
|
|
100
|
+ 'gl_project_online_check.qa_status AS qa_status',
|
|
96
|
'gl_project_payment.amount AS amount',
|
101
|
'gl_project_payment.amount AS amount',
|
|
97
|
'gl_project_deploy_build.dept_id AS dept_id',
|
102
|
'gl_project_deploy_build.dept_id AS dept_id',
|
|
98
|
'gl_project_deploy_build.keyword_num AS key',
|
103
|
'gl_project_deploy_build.keyword_num AS key',
|
|
@@ -113,7 +118,6 @@ class OptimizeController extends BaseController |
|
@@ -113,7 +118,6 @@ class OptimizeController extends BaseController |
|
113
|
'gl_project_deploy_optimize.domain AS domain',
|
118
|
'gl_project_deploy_optimize.domain AS domain',
|
|
114
|
'gl_project_deploy_optimize.quality_mid AS quality_mid',
|
119
|
'gl_project_deploy_optimize.quality_mid AS quality_mid',
|
|
115
|
'gl_project_deploy_optimize.design_mid AS design_mid',
|
120
|
'gl_project_deploy_optimize.design_mid AS design_mid',
|
|
116
|
- 'gl_project_payment.amount AS amount',
|
|
|
|
117
|
];
|
121
|
];
|
|
118
|
return $select;
|
122
|
return $select;
|
|
119
|
}
|
123
|
}
|
