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

调整

dev
vine_liutk 2022-11-08 16:15:04 +08:00
parent 3ea56b7d68
commit ff4c418134
8 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AdminRoleController.php
View File

@ -14,7 +14,7 @@ class AdminRoleController extends Controller
public function index(Request $request) public function index(Request $request)
{ {
$query = AdminRole::filter($request->input())->where('id', '>', '1'); $query = AdminRole::filter($request->input())->where('id', '>', '1');
$list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50)); $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
return $this->json(AdminRoleResource::collection($list)); return $this->json(AdminRoleResource::collection($list));
} }

2
app/Http/Controllers/AdminUserController.php
View File

@ -16,7 +16,7 @@ class AdminUserController extends Controller
public function index(Request $request) public function index(Request $request)
{ {
$query = AdminUser::filter($request->all())->where('id', '>', 1); $query = AdminUser::filter($request->all())->where('id', '>', 1);
$list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50)); $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
return $this->json(AdminUserResource::collection($list)); return $this->json(AdminUserResource::collection($list));
} }

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

@ -23,7 +23,7 @@ class AgriculturalBaseController extends Controller
public function index(Request $request) public function index(Request $request)
{ {
$query = AgriculturalBase::with('crops')->filter($request->all())->sort(); $query = AgriculturalBase::with('crops')->filter($request->all())->sort();
$list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50)); $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
return $this->json(AgriculturalBaseResource::collection($list)); return $this->json(AgriculturalBaseResource::collection($list));
} }

4
app/Http/Controllers/CropFlowController.php
View File

@ -15,11 +15,11 @@ class CropFlowController extends Controller
{ {
$query = CropFlow::filter($request->input()); $query = CropFlow::filter($request->input());
$totalNum = $query->sum('sale'); //总产量 $totalNum = $query->sum('sale'); //总产量
$list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50)); $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
$list->load(['createdBy']); $list->load(['createdBy']);
return $this->json([ return $this->json([
'total' => $totalNum, // 'total' => $totalNum,
'list' => CropFlowResource::collection($list), 'list' => CropFlowResource::collection($list),
]); ]);
} }

9
app/Http/Controllers/CropYieldController.php
View File

@ -17,14 +17,11 @@ class CropYieldController extends Controller
public function index(Request $request) public function index(Request $request)
{ {
$query = CropYield::filter($request->all()); $query = CropYield::filter($request->all());
$totalNum = $query->sum('yield'); //总产量 // $totalNum = (clone $query)->sum('yield'); //总产量
$list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50)); $list = $query->sort()->paginate(Paginator::resolvePerPage('per_page', 20, 50));
$list->load(['base', 'createdBy']); $list->load(['base', 'createdBy']);
return $this->json([ return $this->json(CropYieldResource::collection($list));
'total' => $totalNum,
'list' => CropYieldResource::collection($list),
]);
} }
public function store(CropYieldRequest $request) public function store(CropYieldRequest $request)

2
app/Http/Controllers/DeviceController.php
View File

@ -19,7 +19,7 @@ class DeviceController extends Controller
public function index(Request $request) public function index(Request $request)
{ {
$query = Device::with('base')->filter($request->input()); $query = Device::with('base')->filter($request->input());
$list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50)); $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
return $this->json(DeviceResource::collection($list)); return $this->json(DeviceResource::collection($list));
} }

2
app/Http/Controllers/FriendLinkController.php
View File

@ -13,7 +13,7 @@ class FriendLinkController extends Controller
{ {
$query = FriendLink::filter($request->all()); $query = FriendLink::filter($request->all());
$list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50)); $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
return $this->json(FriendLinkResource::collection($list)); return $this->json(FriendLinkResource::collection($list));
} }

4
app/Models/CropYield.php
View File

@ -21,6 +21,10 @@ class CropYield extends Model
'category_id', 'category_id',
]; ];
public function scopeSort($q){
return $q->orderBy('created_at', 'desc');
}
/** /**
* 基地 * 基地
* *