|
@@ -95,6 +95,7 @@ class RenewProjectController extends BaseController |
|
@@ -95,6 +95,7 @@ class RenewProjectController extends BaseController |
|
95
|
* @time :2023/8/18 14:33
|
95
|
* @time :2023/8/18 14:33
|
|
96
|
*/
|
96
|
*/
|
|
97
|
public function notHaveRenewItems(Project $project){
|
97
|
public function notHaveRenewItems(Project $project){
|
|
|
|
98
|
+ $this->map['type'] = $project::TYPE_FIVE;//未续费网站
|
|
98
|
$lists = $project->where($this->map)->with('payment')->with('deploy_build')
|
99
|
$lists = $project->where($this->map)->with('payment')->with('deploy_build')
|
|
99
|
->with('deploy_optimize')->with('online_check')
|
100
|
->with('deploy_optimize')->with('online_check')
|
|
100
|
->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
|
101
|
->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
|
|
@@ -145,7 +146,6 @@ class RenewProjectController extends BaseController |
|
@@ -145,7 +146,6 @@ class RenewProjectController extends BaseController |
|
145
|
'task_pending_num' => Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]),
|
146
|
'task_pending_num' => Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]),
|
|
146
|
'optimist_status'=>$item['online_check']['optimist_status'] ?? 0,
|
147
|
'optimist_status'=>$item['online_check']['optimist_status'] ?? 0,
|
|
147
|
'qa_status'=>$item['online_check']['qa_status'] ?? 0,
|
148
|
'qa_status'=>$item['online_check']['qa_status'] ?? 0,
|
|
148
|
- 'service_day'=>$item['deploy_build']['service_duration'],
|
|
|
|
149
|
];
|
149
|
];
|
|
150
|
return $item;
|
150
|
return $item;
|
|
151
|
}
|
151
|
}
|