Explorar o código

日志搜索慢的 问题

LD %!s(int64=5) %!d(string=hai) anos
pai
achega
fb20f00499

+ 4 - 1
app/Http/Controllers/InventoryController.php

@@ -33,7 +33,10 @@ class InventoryController extends Controller
     //全部库存
     public function allInventory(Request $request){
         if(!Gate::allows("库存管理-库存")){ return redirect(url('/'));  }
-        $oracleActTransactingLogs=app('allInventoryService')->paginate($request->input());
+
+        /** @var AllInventoryService $service */
+        $service = app('allInventoryService');
+        $oracleActTransactingLogs= $service->paginate($request->input());
         $oracleActTransactingLogs=json_encode($oracleActTransactingLogs);
         $owners=OracleBasCustomer::query()->select('customerid','descr_c')->where('customer_type','OW')->where('active_flag','Y')->get();
         $isTotalStock=true;

+ 4 - 5
app/Http/Controllers/LogController.php

@@ -22,7 +22,7 @@ class LogController extends Controller
      * Display a listing of the resource.
      *
      * @param Request $request
-     * @return LengthAwarePaginator
+     * @return Application|LengthAwarePaginator|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function index(Request $request)
     {
@@ -46,8 +46,7 @@ class LogController extends Controller
             session()->flash('warning', '请选择开始时间');
             return view('maintenance.log.index', ['logs' => null]);
         }
-        $query = Log::query()
-            ->orderBy('id', 'desc');
+        $query = Log::query();
         if ($request->has('operation')) {
             $query->where('operation', 'like', $request->operation . '%');
         }
@@ -66,8 +65,8 @@ class LogController extends Controller
         if ($request->has('created_at_end')) {
             $query->where('created_at', '<=', $request->created_at_end);
         }
-
-        $logs = $query->paginate($request->paginate);
+        $query->orderByDesc('created_at');
+        $logs = $query->paginate($request->paginate??50);
         return view('maintenance.log.index', ['logs' => $logs]);
     }
 

+ 3 - 2
app/Http/Controllers/PackageController.php

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

+ 1 - 1
resources/views/maintenance/log/index.blade.php

@@ -41,7 +41,7 @@
                     </tr>
                 </table>
                     @if($logs)
-                    {{--带参分页查询--}}
+                    带参分页查询
                     {{$logs->withQueryString()->links()}}
                     @endif
             </div>