pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

dev
Jing Li 2023-08-06 17:04:47 +08:00
parent feadeeb967
commit 36198d02ff
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/AgriculturalBaseController.php
View File

@ -5,15 +5,15 @@ namespace App\Http\Controllers;
use App\Enums\BaseType; use App\Enums\BaseType;
use App\Enums\DeviceStatus; use App\Enums\DeviceStatus;
use App\Enums\DeviceType; use App\Enums\DeviceType;
use App\Enums\OperationType;
use App\Helpers\Paginator; use App\Helpers\Paginator;
use App\Http\Requestes\AgriculturalBaseRequest; use App\Http\Requestes\AgriculturalBaseRequest;
use App\Http\Resources\AgriculturalBaseResource; use App\Http\Resources\AgriculturalBaseResource;
use App\Models\AgriculturalBase; use App\Models\AgriculturalBase;
use App\Models\Device; use App\Models\Device;
use App\Services\OperationLogService;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use App\Services\OperationLogService;
use App\Enums\OperationType;
class AgriculturalBaseController extends Controller class AgriculturalBaseController extends Controller
{ {
@ -26,7 +26,7 @@ class AgriculturalBaseController extends Controller
public function index(Request $request) public function index(Request $request)
{ {
$query = AgriculturalBase::with(['crops','industry'])->filter($request->all())->sort(); $query = AgriculturalBase::with(['crops','industry'])->filter($request->all())->sort();
$list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50)); $list = $query->paginate(Paginator::resolvePerPage('per_page', 20));
return $this->json(AgriculturalBaseResource::collection($list)); return $this->json(AgriculturalBaseResource::collection($list));
} }