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

gx



查看合并请求 !2803

@@ -147,13 +147,13 @@ class DownloadProject extends Command
             'project.pm',
             'project.pm',
             'project.projectV6',
             'project.projectV6',
         ]);
         ]);
-        $query->where('title', 'like', '%' . $search . '%')
+        $query = $query->where('title', 'like', '%' . $search . '%')
             ->orWhereHas('project', function ($q1) use ($search) {
             ->orWhereHas('project', function ($q1) use ($search) {
                 $q1->where('title', 'like', '%' . $search . '%')
                 $q1->where('title', 'like', '%' . $search . '%')
                     ->orWhere('company_name', '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个小时未处理的工单
+        $query = $query->where('status', '!=' ,Tickets::STATUS_COMPLETED)->where('plan_end_at','<',date("Y-m-d H:i:s", strtotime("-72 hours")));
+        $query = $query->where('status', 0)->where('plan_end_at','<',date("Y-m-d H:i:s", strtotime("-120 hours")));//超过120个小时未处理的工单
         //TODO::用户部门搜索
         //TODO::用户部门搜索
         if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){
         if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){
             $manageHrModel = new ManageHr();
             $manageHrModel = new ManageHr();
@@ -165,12 +165,12 @@ class DownloadProject extends Command
                     //售后技术
                     //售后技术
                     $manageIdArr = $manageHrModel->selectField(['entry_position' => ['in', [42, 43, 45, 48, 51]], 'status' => 1], 'manage_id');
                     $manageIdArr = $manageHrModel->selectField(['entry_position' => ['in', [42, 43, 45, 48, 51]], 'status' => 1], 'manage_id');
                 }
                 }
-                $query->whereHas('logs', function ($q) use ($manageIdArr) {
+                $query = $query->whereHas('logs', function ($q) use ($manageIdArr) {
                     $q->whereIn('engineer_id', $manageIdArr);
                     $q->whereIn('engineer_id', $manageIdArr);
                 });
                 });
             }else{
             }else{
                 $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');
                 $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');
-                $query->whereHas('logs', function ($q) use ($manageIdArr) {
+                $query = $query->whereHas('logs', function ($q) use ($manageIdArr) {
                     $q->whereIn('engineer_id', $manageIdArr);
                     $q->whereIn('engineer_id', $manageIdArr);
                 });
                 });
             }
             }