调整命名

app/Http/Controllers/PackageController.php

@@ -36,7 +36,7 @@ class PackageController extends Controller
     {
         if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
         $packages = app('packageService')->paginate($request);
-        return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->selectGet(),'request'=>$request->input()]);
+        return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->getSelection(),'request'=>$request->input()]);
     }
 
     /**

app/Http/Controllers/ProcessController.php

@@ -46,7 +46,7 @@ class ProcessController extends Controller
     {
         if(!Gate::allows('二次加工管理-查询')){ return redirect(url('/'));  }
         $processes = app('processService')->paginate($request);
-        $owners=$ownerService->selectGet();
+        $owners=$ownerService->getSelection();
         return view('process.index',['processes'=>$processes,'owners'=>$owners,'request'=>$request->input()]);
     }
 

app/Http/Controllers/RejectedController.php

@@ -46,7 +46,7 @@ class RejectedController extends Controller
         if(!Gate::allows('退货管理-查询')){ return redirect(url('/login'));  }
 
         $rejectedBills=app('rejectedService')->paginate($request);
-        $owners = $ownerService->selectGet();
+        $owners = $ownerService->getSelection();
         $qualityLabels = $qualityLabelService->get();
         $logistics=$logisticService->get();
         $paginateParams = $request->input();

app/Http/Controllers/WaybillsController.php

@@ -52,8 +52,8 @@ class WaybillsController extends Controller
         $waybills=app('waybillService')->paginate($request);
         return view('waybill.index', [
             'waybills' => $waybills,
-            'carriers' => $carrierService->selectGet(),
-            'owners' => $ownerService->selectGet(),
+            'carriers' => $carrierService->getSelection(),
+            'owners' => $ownerService->getSelection(),
             'request'=>$request->input(),
             'uriType'=>$request->uriType??'']);
     }
@@ -65,7 +65,7 @@ class WaybillsController extends Controller
         $type="";
         if ($request->type==='ZF')$type='直发车';
         if ($request->type==='ZX')$type='专线';
-        return view('waybill.create',['owners'=>$ownerService->selectGet(),'type'=>$type]);
+        return view('waybill.create',['owners'=>$ownerService->getSelection(),'type'=>$type]);
     }
 
     public function store(Request $request)
@@ -87,10 +87,10 @@ class WaybillsController extends Controller
             $waybill->deliver_at_date=Carbon::parse($waybill->deliver_at)->format('Y-m-d');
             $waybill->deliver_at_time=Carbon::parse($waybill->deliver_at)->format('H:i:s');
         }
-        $cities=$cityService->selectGet();
-        $units=$unitService->selectGet();
-        $carTypes=$carTypeService->selectGet();
-        return view('waybill/edit',['waybill'=>$waybill,'carriers'=>$carrierService->selectGet(),'cities'=>$cities,'units'=>$units,'carTypes'=>$carTypes]);
+        $cities=$cityService->getSelection();
+        $units=$unitService->getSelection();
+        $carTypes=$carTypeService->getSelection();
+        return view('waybill/edit',['waybill'=>$waybill,'carriers'=>$carrierService->getSelection(),'cities'=>$cities,'units'=>$units,'carTypes'=>$carTypes]);
     }
 
     public function update(Request $request, $id)

app/Services/CarTypeService.php

@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\CarType;
 
@@ -10,11 +10,11 @@ Class CarTypeService
      * array | string $column
      * 默认一些select字段,可传递string 或 array来指定select字段
      */
-    public function selectGet($column = ['id','name']){
+    public function getSelection($column = ['id','name']){
         if (!is_array($column)) {
             $column = [$column];
         }
         return CarType::query()->select($column)->get();
     }
 
-}
+}

app/Services/CarrierService.php

@@ -1,13 +1,13 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Carrier;
 
 Class CarrierService
-{ 
-    public function selectGet(){
+{
+    public function getSelection(){
         return Carrier::query()->select('id','name')->get();
     }
 
-}
+}

app/Services/CityService.php

@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\City;
 
@@ -10,11 +10,11 @@ Class CityService
      * array | string $column
      * 默认一些select字段,可传递string 或 array来指定select字段
      */
-    public function selectGet($column = ['id','name']){
+    public function getSelection($column = ['id','name']){
         if (!is_array($column)) {
             $column = [$column];
         }
         return City::query()->select($column)->get();
     }
 
-}
+}

app/Services/OwnerService.php

@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Owner;
 
@@ -10,8 +10,8 @@ Class OwnerService
      * array | string $column
      * 默认一些select字段,可传递string 或 array来指定select字段
      */
-    public function selectGet($column = ['id','name']){
+    public function getSelection($column = ['id','name']){
         return Owner::filterAuthorities()->select($column)->get();
     }
 
-}
+}

app/Services/UnitService.php

@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Unit;
 
@@ -10,11 +10,11 @@ Class UnitService
      * array | string $column
      * 默认一些select字段,可传递string 或 array来指定select字段
      * */
-    public function selectGet($column = ['id','name']){
+    public function getSelection($column = ['id','name']){
         if (!is_array($column)) {
             $column = [$column];
         }
         return Unit::query()->select($column)->get();
     }
 
-}
+}