|
...
|
...
|
@@ -56,8 +56,6 @@ class ProjectController extends BaseController |
|
|
|
->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
|
|
|
|
$query = $this->searchParam($query);
|
|
|
|
$lists = $query->orderBy('gl_project.id', 'desc')->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
|
|
|
|
var_dump($lists);
|
|
|
|
die();
|
|
|
|
if(!empty($lists) && !empty($lists['list'])){
|
|
|
|
foreach ($lists['list'] as $k => $v){
|
|
|
|
$v = $this->handleParam($v);
|
|
...
|
...
|
@@ -283,8 +281,8 @@ class ProjectController extends BaseController |
|
|
|
$item['keyword_num'] = $item['key'] ?? 0;
|
|
|
|
$item['autologin_code'] = getAutoLoginCode($item['id']);
|
|
|
|
$item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
|
|
|
|
$item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
|
|
|
|
$item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
|
|
|
|
// $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
|
|
|
|
// $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
|
|
|
|
return $item;
|
|
|
|
}
|
|
|
|
|
...
|
...
|
|