|
...
|
...
|
@@ -91,12 +91,12 @@ class ProjectController extends BaseController |
|
|
|
*/
|
|
|
|
public function lists(Project $project){
|
|
|
|
$map = [];
|
|
|
|
//搜索参数处理
|
|
|
|
$map = $this->searchParam($map,$this->map);
|
|
|
|
//类型
|
|
|
|
if(isset($this->map['type'])){
|
|
|
|
$map['type'] = $this->searchType($this->map['type']);
|
|
|
|
}
|
|
|
|
//搜索参数处理
|
|
|
|
$map = $this->searchParam($map,$this->map);
|
|
|
|
$filed = ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', '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);
|
|
...
|
...
|
@@ -209,17 +209,13 @@ class ProjectController extends BaseController |
|
|
|
public function searchParam(&$map,$param){
|
|
|
|
//搜索技术组
|
|
|
|
if(!empty($param['dep_id'])){
|
|
|
|
$map['id'] = ['in', DeployBuild::where('dept_id', $this->param['dep_id'])->pluck('project_id')->toArray()];
|
|
|
|
$map['id'] = ['in', DeployBuild::where('dept_id', $param['dep_id'])->pluck('project_id')->toArray()];
|
|
|
|
}
|
|
|
|
//搜索技术人员
|
|
|
|
if(!empty($param['manage_id'])){
|
|
|
|
$map['id'] = ['in', DeployBuild::where('leader_mid', $this->param['manage_id'])
|
|
|
|
->orwhere('manager_mid', $this->param['manage_id'])
|
|
|
|
->orwhere('designer_mid', $this->param['manage_id'])
|
|
|
|
->orwhere('tech_mid', $this->param['manage_id'])
|
|
|
|
->pluck('project_id')
|
|
|
|
->toArray()];
|
|
|
|
|
|
|
|
$map['id'] = ['in', DeployBuild::where('leader_mid', $param['manage_id'])
|
|
|
|
->orwhere('manager_mid', $param['manage_id'])->orwhere('designer_mid', $param['manage_id'])
|
|
|
|
->orwhere('tech_mid', $param['manage_id'])->pluck('project_id')->toArray()];
|
|
|
|
}
|
|
|
|
//按类型搜索
|
|
|
|
if(!empty($param['search']) && !empty($param['search_type'])){
|
...
|
...
|
|