gx

@@ -141,12 +141,19 @@ class DownloadProject extends Command
     {
     {
         $this->param['dept_id'] = 2;
         $this->param['dept_id'] = 2;
         $this->param['entry_position'] = 2;
         $this->param['entry_position'] = 2;
+        $search = '资料上传';
         $query = Tickets::with([
         $query = Tickets::with([
             'logs.engineer',
             'logs.engineer',
             'project.pm',
             'project.pm',
             'project.projectV6',
             '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::用户部门搜索
         //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();