|
...
|
...
|
@@ -16,6 +16,7 @@ use App\Http\Logic\Aside\Project\ProjectLogic; |
|
|
|
use App\Http\Logic\Aside\Project\RenewLogic;
|
|
|
|
use App\Models\ASide\APublicModel;
|
|
|
|
use App\Models\Channel\Channel;
|
|
|
|
use App\Models\Domain\DomainInfo;
|
|
|
|
use App\Models\HomeCount\Count;
|
|
|
|
use App\Models\Manage\Manage;
|
|
|
|
use App\Models\Project\DeployBuild;
|
|
...
|
...
|
@@ -39,13 +40,15 @@ class RenewProjectController extends BaseController |
|
|
|
$this->searchParam($map,$this->map,$arr);
|
|
|
|
//按类型搜索
|
|
|
|
$map['id'] = ['in', $arr];
|
|
|
|
$filed = ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', 'created_at'];
|
|
|
|
$filed = ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', 'remain_day' ,'created_at'];
|
|
|
|
$lists = $project->formatQuery($map)->select($filed)->with('payment')->with('deploy_build')
|
|
|
|
->with('deploy_optimize')->with('online_check')->paginate($this->row, ['*'], 'page', $this->page);
|
|
|
|
if(!empty($lists)){
|
|
|
|
$lists = $lists->toArray();
|
|
|
|
$manageModel = new Manage();
|
|
|
|
$domainModel = new DomainInfo();
|
|
|
|
foreach ($lists['list'] as $k=>$item){
|
|
|
|
$item = $this->handleParam($item);
|
|
|
|
$item = $this->handleParam($item,$manageModel,$domainModel);
|
|
|
|
$lists['list'][$k] = $item;
|
|
|
|
}
|
|
|
|
}
|
|
...
|
...
|
@@ -138,8 +141,10 @@ class RenewProjectController extends BaseController |
|
|
|
->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
|
|
|
|
if(!empty($lists)){
|
|
|
|
$lists = $lists->toArray();
|
|
|
|
$manageModel = new Manage();
|
|
|
|
$domainModel = new DomainInfo();
|
|
|
|
foreach ($lists['list'] as $k=>$item){
|
|
|
|
$item = $this->handleParam($item);
|
|
|
|
$item = $this->handleParam($item,$manageModel,$domainModel);
|
|
|
|
$lists['list'][$k] = $item;
|
|
|
|
}
|
|
|
|
}
|
|
...
|
...
|
@@ -153,9 +158,10 @@ class RenewProjectController extends BaseController |
|
|
|
* @method :post
|
|
|
|
* @time :2023/8/18 14:44
|
|
|
|
*/
|
|
|
|
public function handleParam(&$item){
|
|
|
|
$manageModel = new Manage();
|
|
|
|
$data = APublicModel::getNumByProjectId($item['id']);
|
|
|
|
public function handleParam(&$item,&$manageModel,&$domainModel){
|
|
|
|
if($item['type'] != Project::TYPE_ZERO){
|
|
|
|
$data = APublicModel::getNumByProjectId($item['id']);
|
|
|
|
}
|
|
|
|
$item = [
|
|
|
|
'id' => $item['id'],
|
|
|
|
'title' => $item['title'],
|
|
...
|
...
|
@@ -174,7 +180,7 @@ class RenewProjectController extends BaseController |
|
|
|
'type' => $item['type'],
|
|
|
|
'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
|
|
|
|
'plan' =>Project::planMap()[$item['deploy_build']['plan']],
|
|
|
|
'domain' => $item['deploy_optimize']['domain'] ?? 0,
|
|
|
|
'domain' => !empty($item['deploy_optimize']['domain']) ? $domainModel->getDomain($item['deploy_optimize']['domain']) : '',
|
|
|
|
'created_at' => date('Y年m月d日', strtotime($item['created_at'])),
|
|
|
|
'autologin_code' => getAutoLoginCode($item['id']),
|
|
|
|
'product_num' => $data['product'] ?? 0,
|
|
...
|
...
|
@@ -184,6 +190,7 @@ class RenewProjectController extends BaseController |
|
|
|
'task_pending_num' => Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]),
|
|
|
|
'optimist_status'=>$item['online_check']['optimist_status'] ?? 0,
|
|
|
|
'qa_status'=>$item['online_check']['qa_status'] ?? 0,
|
|
|
|
'service_day'=>$item['remain_day'] ?? 0,
|
|
|
|
];
|
|
|
|
return $item;
|
|
|
|
}
|
...
|
...
|
|
