周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 993b07daefc5b4aadc90d728fc6feb7e5d27f3ad 2 个父辈 2d9d390f 1eedf144

合并分支 'lyh-server' 到 'master' 

Lyh server



查看合并请求 !2802
内嵌 并排对比
正在显示 2 个修改的文件 包含 20 行增加 和 6 行删除
@@ -141,12 +141,19 @@ class DownloadProject extends Command @@ -141,12 +141,19 @@ class DownloadProject extends Command
141 { 141 {
142 $this->param['dept_id'] = 2; 142 $this->param['dept_id'] = 2;
143 $this->param['entry_position'] = 2; 143 $this->param['entry_position'] = 2;
  144 + $search = '资料上传';
144 $query = Tickets::with([ 145 $query = Tickets::with([
145 'logs.engineer', 146 'logs.engineer',
146 'project.pm', 147 'project.pm',
147 'project.projectV6', 148 'project.projectV6',
148 ]); 149 ]);
149 - $query->where('status', 0)->where('plan_end_at','<',date("Y-m-d H:i:s", strtotime("-72 hours")));//超过120个小时未处理的工单 150 + $query->where('title', 'like', '%' . $search . '%')
  151 + ->orWhereHas('project', function ($q1) use ($search) {
  152 + $q1->where('title', 'like', '%' . $search . '%')
  153 + ->orWhere('company_name', 'like', '%' . $search . '%');
  154 + });
  155 + $query->where('status', '!=' ,Tickets::STATUS_COMPLETED)->where('plan_end_at','<',date("Y-m-d H:i:s", strtotime("-72 hours")));
  156 + $query->where('status', 0)->where('plan_end_at','<',date("Y-m-d H:i:s", strtotime("-120 hours")));//超过120个小时未处理的工单
150 //TODO::用户部门搜索 157 //TODO::用户部门搜索
151 if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){ 158 if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){
152 $manageHrModel = new ManageHr(); 159 $manageHrModel = new ManageHr();
@@ -49,11 +49,18 @@ class OptimizeController extends BaseController @@ -49,11 +49,18 @@ class OptimizeController extends BaseController
49 ->orderBy('gl_project_deploy_optimize.start_date','desc'); 49 ->orderBy('gl_project_deploy_optimize.start_date','desc');
50 $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray(); 50 $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
51 if(!empty($lists) && !empty($lists['list'])){ 51 if(!empty($lists) && !empty($lists['list'])){
  52 + //多apino项目
  53 + $api_no_project = [2140,3041];
52 $rankDataModel = new RankData(); 54 $rankDataModel = new RankData();
53 foreach ($lists['list'] as $k => $v){ 55 foreach ($lists['list'] as $k => $v){
54 - //特殊项目 两个api_no  
55 - if($v['id'] == 2104){  
56 - $keyword_num_map = [10690=>100, 11201 => 50]; 56 + if(in_array($v['id'],$api_no_project)){
  57 + switch ($v['id']){
  58 + case 2104:$keyword_num_map = [10690=>100, 11201 => 50];
  59 + break;
  60 + case 3041:$keyword_num_map = [11298=>100, 10659 => 50];
  61 + break;
  62 + default:break;
  63 + }
57 $v['first_page_num'] = $v['indexed_pages_num'] = $v['g'] = $v['keyword_num'] = []; 64 $v['first_page_num'] = $v['indexed_pages_num'] = $v['g'] = $v['keyword_num'] = [];
58 foreach ($keyword_num_map as $api_no => $keyword_num){ 65 foreach ($keyword_num_map as $api_no => $keyword_num){
59 $data = $rankDataModel->read(['project_id'=>$v['id'],'api_no' => $api_no, 'lang'=>''],['first_page_num','indexed_pages_num']); 66 $data = $rankDataModel->read(['project_id'=>$v['id'],'api_no' => $api_no, 'lang'=>''],['first_page_num','indexed_pages_num']);
@@ -66,8 +73,8 @@ class OptimizeController extends BaseController @@ -66,8 +73,8 @@ class OptimizeController extends BaseController
66 $v['indexed_pages_num'] = implode(',', $v['indexed_pages_num']); 73 $v['indexed_pages_num'] = implode(',', $v['indexed_pages_num']);
67 $v['g'] = implode(',', $v['g']); 74 $v['g'] = implode(',', $v['g']);
68 $v['keyword_num'] = implode(',', $v['keyword_num']); 75 $v['keyword_num'] = implode(',', $v['keyword_num']);
69 - }else{  
70 - $data = $rankDataModel->read(['project_id'=>$v['id'],'lang'=>'', 'api_no' => $v['api_no']],['first_page_num','indexed_pages_num']); 76 + }else {
  77 + $data = $rankDataModel->read(['project_id' => $v['id'], 'lang' => '', 'api_no' => $v['api_no']], ['first_page_num', 'indexed_pages_num']);
71 $v['first_page_num'] = $data['first_page_num'] ?? 0; 78 $v['first_page_num'] = $data['first_page_num'] ?? 0;
72 $v['indexed_pages_num'] = $data['indexed_pages_num'] ?? 0; 79 $v['indexed_pages_num'] = $data['indexed_pages_num'] ?? 0;
73 $v['g'] = $this->getGNum($v['id']); 80 $v['g'] = $this->getGNum($v['id']);