人事管理--临时工报表修改

app/Http/Controllers/LaborReportController.php

@@ -62,7 +62,7 @@ class LaborReportController extends Controller
             }
         }
         $userWorkGroups=UserWorkgroup::select('id','name')->get();
-        return view('personnel/laborReport/index',compact('laborReports','userWorkGroups','laravelEchoPrefix','permittingWorkgroups','requests','tokenOfBroadcastEnterAndLeave'));
+        return view('personnel/laborReport/index',compact('laborReports','userWorkGroups','laravelEchoPrefix','permittingWorkgroups','paginateParams','tokenOfBroadcastEnterAndLeave'));
     }
     public function export(Request $request){
         if (!Gate::allows('人事管理-临时工报表')){return redirect(url('/')); }

app/Services/LaborReportService.php

@@ -17,6 +17,7 @@ use App\UserLabor;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 
 
@@ -35,17 +36,16 @@ class LaborReportService
         if (!$request->is_export){
             $laborReports->whereNotIn('enter_number',$enterNumbers);
         }else $request->offsetUnset('is_export');
-        if(Gate::allows('人事管理-临时工报表-可见全部组')||Gate::allows('人事管理-门卫审核')){
-            $laborReports->orWhereNull('user_workgroup_id');
-        }
         $columnQueryRules=[
-            'enter_number' => ['like' => ''],
+            'enter_number' => ['timeLimit' => 15],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
-            'identity_number' => ['like' => ''],
-            'mobile_phone' => ['like' => ''],
+            'identity_number' => ['timeLimit' => 15]
         ];
         $laborReports = app(QueryService::class)->query($request,$laborReports,$columnQueryRules);
+        if(Gate::allows('人事管理-临时工报表-可见全部组')||Gate::allows('人事管理-门卫审核')){
+            $laborReports->orWhereNull('user_workgroup_id');
+        }
         return $laborReports;
     }
     public function paginate(Request $request){