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

Lyh server



查看合并请求 !2802

@@ -141,12 +141,19 @@ class DownloadProject extends Command
     {
         $this->param['dept_id'] = 2;
         $this->param['entry_position'] = 2;
+        $search = '资料上传';
         $query = Tickets::with([
             'logs.engineer',
             'project.pm',
             'project.projectV6',
         ]);
-        $query->where('status', 0)->where('plan_end_at','<',date("Y-m-d H:i:s", strtotime("-72 hours")));//超过120个小时未处理的工单
+        $query->where('title', 'like', '%' . $search . '%')
+            ->orWhereHas('project', function ($q1) use ($search) {
+                $q1->where('title', 'like', '%' . $search . '%')
+                    ->orWhere('company_name', 'like', '%' . $search . '%');
+            });
+        $query->where('status', '!=' ,Tickets::STATUS_COMPLETED)->where('plan_end_at','<',date("Y-m-d H:i:s", strtotime("-72 hours")));
+        $query->where('status', 0)->where('plan_end_at','<',date("Y-m-d H:i:s", strtotime("-120 hours")));//超过120个小时未处理的工单
         //TODO::用户部门搜索
         if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){
             $manageHrModel = new ManageHr();

@@ -49,11 +49,18 @@ class OptimizeController extends BaseController
             ->orderBy('gl_project_deploy_optimize.start_date','desc');
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         if(!empty($lists) && !empty($lists['list'])){
+            //多apino项目
+            $api_no_project = [2140,3041];
             $rankDataModel = new RankData();
             foreach ($lists['list'] as $k => $v){
-                //特殊项目 两个api_no
-                if($v['id'] == 2104){
-                    $keyword_num_map = [10690=>100, 11201 => 50];
+                if(in_array($v['id'],$api_no_project)){
+                    switch ($v['id']){
+                        case 2104:$keyword_num_map = [10690=>100, 11201 => 50];
+                            break;
+                        case 3041:$keyword_num_map = [11298=>100, 10659 => 50];
+                            break;
+                        default:break;
+                    }
                     $v['first_page_num'] = $v['indexed_pages_num'] = $v['g'] = $v['keyword_num'] = [];
                     foreach ($keyword_num_map as $api_no => $keyword_num){
                         $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
                     $v['indexed_pages_num'] = implode(',', $v['indexed_pages_num']);
                     $v['g'] = implode(',', $v['g']);
                     $v['keyword_num'] = implode(',', $v['keyword_num']);
-                }else{
-                    $data = $rankDataModel->read(['project_id'=>$v['id'],'lang'=>'', 'api_no' => $v['api_no']],['first_page_num','indexed_pages_num']);
+                }else {
+                    $data = $rankDataModel->read(['project_id' => $v['id'], 'lang' => '', 'api_no' => $v['api_no']], ['first_page_num', 'indexed_pages_num']);
                     $v['first_page_num'] = $data['first_page_num'] ?? 0;
                     $v['indexed_pages_num'] = $data['indexed_pages_num'] ?? 0;
                     $v['g'] = $this->getGNum($v['id']);