|
...
|
...
|
@@ -47,70 +47,40 @@ class ProjectController extends BaseController |
|
|
|
* @time :2023/8/30 10:11
|
|
|
|
*/
|
|
|
|
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['extend_type'] = 0;//排除未续费项目
|
|
|
|
}
|
|
|
|
$filed = ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', 'remain_day' ,'created_at'];
|
|
|
|
$lists = $project->formatQuery($map)->orderBy('id','desc')->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,$manageModel,$domainModel);
|
|
|
|
$lists['list'][$k] = $item;
|
|
|
|
$query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
|
|
|
|
->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
|
|
|
|
->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
|
|
|
|
->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
|
|
|
|
$query = $this->searchParam($query);
|
|
|
|
$lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
|
|
|
|
if(!empty($lists) && !empty($lists['list'])){
|
|
|
|
foreach ($lists['list'] as $k => $v){
|
|
|
|
$v = $this->handleParam($v);
|
|
|
|
$lists['list'][$k] = $v;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$this->response('success',Code::SUCCESS,$lists);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :返回参数过滤
|
|
|
|
* @name :returnParamItem
|
|
|
|
* @remark :搜索参数处理
|
|
|
|
* @name :searchParam
|
|
|
|
* @author :lyh
|
|
|
|
* @method :post
|
|
|
|
* @time :2023/8/30 11:07
|
|
|
|
* @time :2023/8/18 10:58
|
|
|
|
*/
|
|
|
|
public function handleParam(&$item,&$manageModel,&$domainModel){
|
|
|
|
if($item['mysql_id'] != 0 && $item['type'] != 0){
|
|
|
|
$data = APublicModel::getNumByProjectId($item['id']);
|
|
|
|
}
|
|
|
|
$item = [
|
|
|
|
'id' => $item['id'],
|
|
|
|
'title' => $item['title'],
|
|
|
|
'channel' => Channel::getChannelText($item['channel']['user_id'] ?? 0),
|
|
|
|
'key' => $item['deploy_build']['keyword_num'] ?? 0,
|
|
|
|
'day' => $item['deploy_build']['service_duration'] ?? 0,
|
|
|
|
'amount' => $item['payment']['amount'] ?? 0,
|
|
|
|
'build_leader' => $manageModel->getName($item['deploy_build']['leader_mid']), //组长
|
|
|
|
'build_manager' => $manageModel->getName($item['deploy_build']['manager_mid']), //项目经理
|
|
|
|
'build_designer' => $manageModel->getName($item['deploy_build']['designer_mid']), //设计师
|
|
|
|
'build_tech' => $manageModel->getName($item['deploy_build']['tech_mid']), //技术助理
|
|
|
|
'optimize_manager' => $manageModel->getName($item['deploy_optimize']['manager_mid']), //优化服务经理
|
|
|
|
'optimize_optimist' => $manageModel->getName($item['deploy_optimize']['optimist_mid']), //优化师
|
|
|
|
'optimize_assist' => $manageModel->getName($item['deploy_optimize']['assist_mid']), //优化助理
|
|
|
|
'optimize_tech' => $manageModel->getName($item['deploy_optimize']['tech_mid']), //售后技术
|
|
|
|
'type' => $item['type'],
|
|
|
|
'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
|
|
|
|
'plan' =>Project::planMap()[$item['deploy_build']['plan']],
|
|
|
|
'domain' => !empty($item['deploy_optimize']['domain']) ? $domainModel->getDomain($item['deploy_optimize']['domain']) : '',
|
|
|
|
'created_at' => date('Y年m月d日', strtotime($item['created_at'])),
|
|
|
|
'product_num' => $data['product'] ?? 0,
|
|
|
|
'keyword_num' => $item['deploy_build']['keyword_num'] ?? 0,
|
|
|
|
'article_num' => ($data['blog'] ?? 0) + ($data['news'] ?? 0),
|
|
|
|
'task_finish_num' => Task::getNumByProjectId($item['id'], Task::STATUS_DOWN),
|
|
|
|
'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;
|
|
|
|
public function searchParam(&$query){
|
|
|
|
//参数type
|
|
|
|
$query = $this->searchType($query);
|
|
|
|
//根据查看权限获取项目搜索条件（必带）
|
|
|
|
$query = $this->getManagerRole($query);
|
|
|
|
//搜索技术组
|
|
|
|
$query = $this->searchDept($query);
|
|
|
|
//搜索技术人员
|
|
|
|
$query = $this->searchManager($query);
|
|
|
|
//按类型搜索
|
|
|
|
$query = $this->searchContent($query);
|
|
|
|
return $query;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
...
|
...
|
@@ -120,53 +90,195 @@ class ProjectController extends BaseController |
|
|
|
* @method :post
|
|
|
|
* @time :2023/8/30 10:14
|
|
|
|
*/
|
|
|
|
public function searchType($type){
|
|
|
|
//初始项目
|
|
|
|
if($type == Project::TYPE_ZERO){
|
|
|
|
$type = Project::TYPE_ZERO;
|
|
|
|
public function searchType(&$query){
|
|
|
|
$query->where('gl_project.delete_status',Project::TYPE_ZERO);
|
|
|
|
if(!isset($this->map['type'])){
|
|
|
|
$this->map['type'] = Project::TYPE_ZERO;
|
|
|
|
}
|
|
|
|
//建站中
|
|
|
|
if($type == Project::TYPE_ONE){
|
|
|
|
$type = Project::TYPE_ONE;
|
|
|
|
if($this->map['type'] == Project::TYPE_ZERO){
|
|
|
|
$query->where('gl_project.type',Project::TYPE_ZERO);
|
|
|
|
}elseif ($this->map['type'] == Project::TYPE_ONE){
|
|
|
|
$query->where('gl_project.type',Project::TYPE_ONE);
|
|
|
|
}elseif ($this->map['type'] == Project::TYPE_TWO){
|
|
|
|
$query->whereIn('gl_project.type', [Project::TYPE_TWO,Project::TYPE_THREE]);
|
|
|
|
}else{
|
|
|
|
$query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
|
|
|
|
}
|
|
|
|
//建站完成
|
|
|
|
if($type == Project::TYPE_TWO){
|
|
|
|
$type = ['in',[Project::TYPE_TWO,Project::TYPE_THREE]];
|
|
|
|
return $query;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :查询字段处理
|
|
|
|
* @name :selectParam
|
|
|
|
* @author :lyh
|
|
|
|
* @method :post
|
|
|
|
* @time :2023/8/18 10:59
|
|
|
|
*/
|
|
|
|
public function selectParam(){
|
|
|
|
$select = [
|
|
|
|
'gl_project.id AS id',
|
|
|
|
'gl_project.title AS title',
|
|
|
|
'gl_project.channel AS channel',
|
|
|
|
'gl_project.company AS company',
|
|
|
|
'gl_project.type AS type',
|
|
|
|
'gl_project.created_at AS created_at',
|
|
|
|
'gl_project_online_check.id AS online_check_id',
|
|
|
|
'gl_project_online_check.question AS question',
|
|
|
|
'gl_project_online_check.optimist_status AS optimist_status',
|
|
|
|
'gl_project_online_check.qa_status AS qa_status',
|
|
|
|
'gl_project_payment.amount AS amount',
|
|
|
|
'gl_project_deploy_build.dept_id AS dept_id',
|
|
|
|
'gl_project_deploy_build.keyword_num AS key',
|
|
|
|
'gl_project_deploy_build.service_duration AS day',
|
|
|
|
'gl_project_deploy_build.leader_mid AS leader_mid',
|
|
|
|
'gl_project_deploy_build.manager_mid AS manager_mid',
|
|
|
|
'gl_project_deploy_build.designer_mid AS designer_mid',
|
|
|
|
'gl_project_deploy_build.tech_mid AS tech_mid',
|
|
|
|
'gl_project_deploy_build.test_domain AS test_domain',
|
|
|
|
'gl_project_deploy_build.plan AS plan',
|
|
|
|
'gl_project_deploy_optimize.dept_id AS optimize_dept_id',
|
|
|
|
'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid',
|
|
|
|
'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid',
|
|
|
|
'gl_project_deploy_optimize.assist_mid AS optimize_assist_mid',
|
|
|
|
'gl_project_deploy_optimize.tech_mid AS optimize_tech_mid',
|
|
|
|
'gl_project_deploy_optimize.design_mid AS design_mid',
|
|
|
|
'gl_project_deploy_optimize.tech_leader AS tech_leader',
|
|
|
|
'gl_project_deploy_optimize.domain AS domain',
|
|
|
|
'gl_project_deploy_optimize.quality_mid AS quality_mid',
|
|
|
|
'gl_project_deploy_optimize.design_mid AS design_mid',
|
|
|
|
'gl_project_payment.amount AS amount',
|
|
|
|
];
|
|
|
|
return $select;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :按需搜索
|
|
|
|
* @name :searchDomainTitle
|
|
|
|
* @author :lyh
|
|
|
|
* @method :post
|
|
|
|
* @time :2023/9/7 18:39
|
|
|
|
*/
|
|
|
|
public function searchContent(&$query){
|
|
|
|
if(!empty($this->map['search']) && !empty($this->map['search_type'])){
|
|
|
|
//搜索域名
|
|
|
|
$query->where(function ($subQuery) {
|
|
|
|
$subQuery->orwhere('gl_project_deploy_optimize.domain','like','%'.$this->map['search'].'%')
|
|
|
|
->orwhere('gl_project.company','like','%'.$this->map['search'].'%')
|
|
|
|
->orwhere('gl_project.title','like','%'.$this->map['search'].'%');
|
|
|
|
});
|
|
|
|
}
|
|
|
|
if($this->param['type'] == Project::TYPE_THREE){
|
|
|
|
$type = ['in',[Project::TYPE_FOUR,Project::TYPE_SIX]];
|
|
|
|
return $query;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :搜索技术组
|
|
|
|
* @name :searchDept
|
|
|
|
* @author :lyh
|
|
|
|
* @method :post
|
|
|
|
* @time :2023/9/7 18:40
|
|
|
|
*/
|
|
|
|
public function searchDept(&$query){
|
|
|
|
if(!empty($this->map['dept_id'])){
|
|
|
|
$query->where(function ($subQuery) {
|
|
|
|
$subQuery->orwhere('gl_project_deploy_build.dept_id',$this->map['dept_id'])
|
|
|
|
->orwhere('gl_project_deploy_optimize.dept_id',$this->map['dept_id']);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
return $type;
|
|
|
|
return $query;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :搜索参数处理
|
|
|
|
* @name :searchParam
|
|
|
|
* @remark :访问权限
|
|
|
|
* @name :getManagerRole
|
|
|
|
* @author :lyh
|
|
|
|
* @method :post
|
|
|
|
* @time :2023/8/30 10:30
|
|
|
|
* @time :2023/9/7 17:28
|
|
|
|
*/
|
|
|
|
public function searchParam(&$map,$param){
|
|
|
|
//搜索技术组
|
|
|
|
if(!empty($param['dep_id'])){
|
|
|
|
$map['id'] = ['in', DeployBuild::where('dept_id', $param['dep_id'])->pluck('project_id')->toArray()];
|
|
|
|
public function getManagerRole(&$query){
|
|
|
|
if($this->manage['role'] != 1){//1代表查看所有
|
|
|
|
//获取用户所在组
|
|
|
|
$managerHr = new ManageHr();
|
|
|
|
$info = $managerHr->read(['manage_id'=>$this->manage['id']]);
|
|
|
|
//获取当前用户自己的项目
|
|
|
|
$query->where(function ($subQuery) use ($info) {
|
|
|
|
$subQuery->where('gl_project_deploy_build.leader_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_build.manager_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_build.designer_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_build.tech_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.manager_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.optimist_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.assist_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.tech_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.tech_leader', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.quality_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.design_mid', $this->manage['id'])
|
|
|
|
->orWhere('gl_project_deploy_build.dept_id', $info['belong_group'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
//搜索技术人员
|
|
|
|
if(!empty($param['manage_id'])){
|
|
|
|
$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()];
|
|
|
|
return $query;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :搜索技术人员
|
|
|
|
* @name :searchManager
|
|
|
|
* @author :lyh
|
|
|
|
* @method :post
|
|
|
|
* @time :2023/9/7 17:16
|
|
|
|
*/
|
|
|
|
public function searchManager(&$query)
|
|
|
|
{
|
|
|
|
if (!empty($this->map['manage_id'])) {
|
|
|
|
$query->where(function ($subQuery) {
|
|
|
|
$subQuery->orWhere('gl_project_deploy_build.leader_mid', $this->map['manage_id'])
|
|
|
|
->orWhere('gl_project_deploy_build.manager_mid', $this->map['manage_id'])
|
|
|
|
->orWhere('gl_project_deploy_build.designer_mid', $this->map['manage_id'])
|
|
|
|
->orWhere('gl_project_deploy_build.tech_mid', $this->map['manage_id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.manager_mid', $this->map['manage_id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.optimist_mid', $this->map['manage_id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.assist_mid', $this->map['manage_id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.tech_mid', $this->map['manage_id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.tech_leader', $this->map['manage_id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.quality_mid', $this->map['manage_id'])
|
|
|
|
->orWhere('gl_project_deploy_optimize.design_mid', $this->map['manage_id']);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
//按类型搜索
|
|
|
|
if(!empty($param['search']) && !empty($param['search_type'])){
|
|
|
|
if($this->param['search_type'] == 'domain'){
|
|
|
|
//搜索域名
|
|
|
|
$map['id'] = ['id', 'in', DeployOptimize::where('domain', 'like', "%{$this->param['search']}%")->pluck('project_id')->toArray()];
|
|
|
|
}else{
|
|
|
|
$map[$param['search_type']] = ['like', "%{$param['search']}%"];
|
|
|
|
}
|
|
|
|
return $query;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :参数处理
|
|
|
|
* @name :handleParam
|
|
|
|
* @author :lyh
|
|
|
|
* @method :post
|
|
|
|
* @time :2023/8/18 14:44
|
|
|
|
*/
|
|
|
|
public function handleParam(&$item){
|
|
|
|
if($item['type'] != Project::TYPE_ZERO){
|
|
|
|
$data = APublicModel::getNumByProjectId($item['id']);
|
|
|
|
}
|
|
|
|
return $map;
|
|
|
|
$manageModel = new Manage();
|
|
|
|
$item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
|
|
|
|
$item['build_leader'] = $manageModel->getName($item['leader_mid']);
|
|
|
|
$item['build_manager'] = $manageModel->getName($item['manager_mid']);
|
|
|
|
$item['build_designer'] = $manageModel->getName($item['designer_mid']);
|
|
|
|
$item['build_tech'] = $manageModel->getName($item['tech_mid']);
|
|
|
|
$item['optimize_manager'] = $manageModel->getName($item['optimize_manager_mid']);
|
|
|
|
$item['optimize_optimist'] = $manageModel->getName($item['optimize_optimist_mid']);
|
|
|
|
$item['optimize_assist'] = $manageModel->getName($item['optimize_assist_mid']);
|
|
|
|
$item['optimize_tech'] = $manageModel->getName($item['optimize_tech_mid']);
|
|
|
|
$item['plan'] = Project::planMap()[$item['plan']];
|
|
|
|
$item['created_at'] = date('Y年m月d日', strtotime($item['created_at']));
|
|
|
|
$item['autologin_code'] = getAutoLoginCode($item['id']);
|
|
|
|
$domainModel = new DomainInfo();
|
|
|
|
$item['domain'] = !empty($item['domain']) ? $domainModel->getDomain($item['domain']) : '';
|
|
|
|
$item['product_num'] = $data['product'] ?? 0;
|
|
|
|
$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]);
|
|
|
|
return $item;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
...
|
...
|
@@ -393,7 +505,7 @@ class ProjectController extends BaseController |
|
|
|
*/
|
|
|
|
public function getServiceConfig(){
|
|
|
|
$serviceConfigModel = new ServerConfig();
|
|
|
|
$list = $serviceConfigModel->list($this->param);
|
|
|
|
$list = $serviceConfigModel->list($this->param,'id',['id','type','title']);
|
|
|
|
$this->response('success',Code::SUCCESS,$list);
|
|
|
|
}
|
|
|
|
|
|
...
|
...
|
@@ -435,6 +547,23 @@ class ProjectController extends BaseController |
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :逻辑删除项目
|
|
|
|
* @name :del
|
|
|
|
* @author :lyh
|
|
|
|
* @method :post
|
|
|
|
* @time :2023/9/8 15:21
|
|
|
|
*/
|
|
|
|
public function del(ProjectLogic $logic){
|
|
|
|
$this->request->validate([
|
|
|
|
'id'=>'required',
|
|
|
|
],[
|
|
|
|
'id.required' => 'id不能为空',
|
|
|
|
]);
|
|
|
|
$logic->projectDel();
|
|
|
|
$this->response('success');
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* 根据渠道商查询项目
|
|
|
|
* @author zbj
|
|
|
|
* @date 2023/9/11
|
...
|
...
|
|
