代码重构

app/Http/Controllers/SearchController.php

@@ -3,11 +3,13 @@
 namespace App\Http\Controllers;
 namespace App\Http\Controllers;
 
 
 
 
+use App\Http\Utils\ApiCode;
 use App\map\InquiryMap;
 use App\map\InquiryMap;
 use App\map\QuoteMap;
 use App\map\QuoteMap;
 use App\Model\BestGoodsModel;
 use App\Model\BestGoodsModel;
 use App\Model\InquiryItemsAssignModel;
 use App\Model\InquiryItemsAssignModel;
 use App\Model\InquiryItemsModel;
 use App\Model\InquiryItemsModel;
+use App\Model\InquiryModel;
 use App\Model\LieBrandModel;
 use App\Model\LieBrandModel;
 use App\Model\QuoteModel;
 use App\Model\QuoteModel;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
@@ -51,16 +53,15 @@ class SearchController extends Controller
 
 
     public function getInquiryList(Request $request){
     public function getInquiryList(Request $request){
         $input = $request->input();
         $input = $request->input();
-        Export($this->getList($input));
+        $userInfo = $this->user();
+        ExportLayui($this->getList($input,0,$userInfo));
+//        ExportLayui((new InquiryModel())->getList($input));
     }
     }
-    protected function getList($input = [],$export = 0)//获取询价列表
+    protected function getList($input = [],$export = 0,$userInfo=[])//获取询价列表
     {
     {
-        $user_id = @$input["user_id"];
-        $user_name = @$input["user_name"];
-
-
+        $user_id = @$userInfo["user_id"];
+        $user_name = @$userInfo["user_name"];
         $rqpConn = DB::connection('rfq');
         $rqpConn = DB::connection('rfq');
-
         $list = $rqpConn->table('inquiry as a')
         $list = $rqpConn->table('inquiry as a')
             ->join('inquiry_items as b', 'a.id', '=', 'b.inquiry_id')
             ->join('inquiry_items as b', 'a.id', '=', 'b.inquiry_id')
             ->select(DB::Raw("lie_a.inquiry_sn,lie_a.currency,lie_a.status as status_a,lie_a.user_name,lie_a.create_name,lie_b.*"))
             ->select(DB::Raw("lie_a.inquiry_sn,lie_a.currency,lie_a.status as status_a,lie_a.user_name,lie_a.create_name,lie_b.*"))
@@ -143,7 +144,7 @@ class SearchController extends Controller
 
 
         $list = $list->paginate(@$input['limit'] ? $input["limit"] : 10, ['*'], 'p', @$page ? $page : 1)->toArray();
         $list = $list->paginate(@$input['limit'] ? $input["limit"] : 10, ['*'], 'p', @$page ? $page : 1)->toArray();
 
 
-        if (!$list) return [20001, '没有数据'];
+        if (!$list) return [ApiCode::API_CODE_NODATA, '没有数据'];
 
 
         $QuoteModel = new QuoteModel();
         $QuoteModel = new QuoteModel();
         $InquiryItemsAssignModel = new InquiryItemsAssignModel();
         $InquiryItemsAssignModel = new InquiryItemsAssignModel();
@@ -216,6 +217,6 @@ class SearchController extends Controller
         if (@$input["is_export"] == 1) { #如果是导出
         if (@$input["is_export"] == 1) { #如果是导出
             $data = $this->clearExport($data);
             $data = $this->clearExport($data);
         }
         }
-        return [0, '成功', $data, $list['total']];
+        return [ApiCode::API_CODE_SUCCESS, '成功', $data, $list['total']];
     }
     }
 }
 }
\ No newline at end of file

app/Http/Utils/ApiCode.php

@@ -12,4 +12,6 @@ interface ApiCode
     const API_CODE_UNLOGINED = 1001;//未登陆
     const API_CODE_UNLOGINED = 1001;//未登陆
 
 
     const API_CODE_DATA_EMPTY = 1003;//数据为空
     const API_CODE_DATA_EMPTY = 1003;//数据为空
+
+    const API_CODE_NODATA = 20001;//没有数据
 }
 }
\ No newline at end of file

app/Http/routes/api.php

@@ -8,4 +8,4 @@ Route::Post('/ApiCreateOneItems','DataController@createInquiryItemsDetail');//
 Route::Post('/ApiDeleteInquiryItems','DataController@deleteInquiryItemsDetail');//删除询价明细;
 Route::Post('/ApiDeleteInquiryItems','DataController@deleteInquiryItemsDetail');//删除询价明细;
 Route::Post('/ApiEditInquiry','DataController@creatInquiry');//新增询价;
 Route::Post('/ApiEditInquiry','DataController@creatInquiry');//新增询价;
 Route::Post('/ApiUpdateOneItems','DataController@editInquiryItemDetail');//修改单条明细记录;
 Route::Post('/ApiUpdateOneItems','DataController@editInquiryItemDetail');//修改单条明细记录;
-//Route::Get('/ApiInquiryList','SearchController@getInquiryList');//询价列表;
+Route::Get('/ApiInquiryList','SearchController@getInquiryList');//询价列表;
\ No newline at end of file