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

gx



查看合并请求 !2800

@@ -137,7 +137,7 @@ class DownloadProject extends Command
      *
      *
      * @return \Illuminate\Http\Response
      * @return \Illuminate\Http\Response
      */
      */
-    public function downloadTicket(AsideTicketListRequest $request)
+    public function downloadTicket()
     {
     {
         $this->param['dept_id'] = 2;
         $this->param['dept_id'] = 2;
         $this->param['entry_position'] = 2;
         $this->param['entry_position'] = 2;
@@ -170,10 +170,6 @@ class DownloadProject extends Command
         }
         }
         // 添加排序功能
         // 添加排序功能
         $query->orderBy('status', 'asc');
         $query->orderBy('status', 'asc');
-        $sortField = $request->input('sort_field', 'plan_end_at');
-        $sortOrder = strtolower($request->input('sort_order', 'asc'));
-        $query->orderBy($sortField, $sortOrder);
-        if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc');
         $lists = $query->get()->toArray();
         $lists = $query->get()->toArray();
         return $this->exportData($lists);
         return $this->exportData($lists);
     }
     }