修复临时工打卡参数大小写引起的BUG

app/Http/Controllers/PersonnelController.php

@@ -74,9 +74,9 @@ class PersonnelController extends Controller
         $id=$request->input('id');
         $userDutyCheck=UserDutyCheck::find($id);
         $user=User::find($userDutyCheck->user_id);
-        $workGroup=$user->userWorkgroups()->first();
-        if ($workGroup){
-            if(!Gate::allows($workGroup->name)){ return ["success"=>false,"data"=>"您无此权限操作！！!"];  }
+        $workgroup=$user->userWorkgroups()->first();
+        if ($workgroup){
+            if(!Gate::allows($workgroup->name)){ return ["success"=>false,"data"=>"您无此权限操作！！!"];  }
         }
         $type=$request->input('type');
         $userDutyCheck->type=$type;
@@ -136,7 +136,7 @@ class PersonnelController extends Controller
         $user=Auth::user();
         if (!$user)return redirect('/');
         $result=$user->getPermittingWorkgroupIdsAttribute();
-        $userWorkgroupIds=$result['workGroupIds'];
+        $userWorkgroupIds=$result['workgroupIds'];
         $users=User::whereHas("userWorkgroups",function (Builder $query)use(&$userWorkgroupIds){
             $query->whereIn("id",$userWorkgroupIds);
         })->get();
@@ -144,7 +144,7 @@ class PersonnelController extends Controller
         $date=date('Y-m-d');
         $userDutyChecks=UserDutyCheck::with('userDetail.user.userWorkgroups')->whereIn("user_id",$user_ids)
             ->where('checked_at','like',$date."%")->get();
-        return view('personnel/checking-in/clockAudit',['userDutyChecks'=>$userDutyChecks,'workGroupSign'=>$result['workGroupSign']]);
+        return view('personnel/checking-in/clockAudit',['userDutyChecks'=>$userDutyChecks,'workgroupSign'=>$result['workgroupSign']]);
     }
 
     //录入补卡

app/Http/Controllers/UserDutyCheckController.php

@@ -10,7 +10,6 @@ use App\UserToken;
 use App\UserWorkgroup;
 use Carbon\Carbon;
 use Endroid\QrCode\QrCode;
-use http\Url;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Cache;
@@ -136,7 +135,7 @@ class UserDutyCheckController extends Controller
         if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
         if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
         $userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
-        $this->log(__METHOD__,"录入临时工,用户,对应工作组,打卡记录".__FUNCTION__,json_encode($request));
+        $this->log(__METHOD__,"录入临时工,用户,对应工作组,打卡记录".__FUNCTION__,json_encode($request->all()));
         $group_name=$userDetail->user->userWorkgroups->first()['name'];
         return response()->view('personnel/checking-in/success',['group_name'=>$group_name??'','full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at])
             ->cookie('userLaborToken',$userLaborToken,config('users.token_check_in_expire_minutes'),'/');
@@ -154,6 +153,7 @@ class UserDutyCheckController extends Controller
         if (!$userDutyCheckOld){
             $userDutyCheck->type="登入";
             $userDutyCheck->save();
+            $this->log(__METHOD__,"提交打卡记录__".__FUNCTION__,json_encode($userDutyCheck));
             return $userDutyCheck;
         }
         $lastDate=Carbon::parse($userDutyCheckOld->checked_at);
@@ -185,6 +185,7 @@ class UserDutyCheckController extends Controller
             }
         }
         $userDutyCheck->save();
+        $this->log(__METHOD__,"提交打卡记录__".__FUNCTION__,json_encode($userDutyCheck));
         return $userDutyCheck;
     }
 

app/User.php

@@ -120,21 +120,21 @@ class User extends Authenticatable
         return array_unique($ownerIds);
     }
     function getPermittingWorkgroupIdsAttribute(){
-        $workGroupIds=[];
+        $workgroupIds=[];
         $response=[];
         if ($this->isSuperAdmin()||Gate::allows('人事管理-打卡审核')){
-            $workGroups=UserWorkgroup::all();
-            $workGroups->each(function (UserWorkgroup $workGroup)use(&$workGroupIds){
-                array_push($workGroupIds,$workGroup['id']);
+            $workgroups=UserWorkgroup::all();
+            $workgroups->each(function (UserWorkgroup $workgroup)use(&$workgroupIds){
+                array_push($workgroupIds,$workgroup['id']);
             });
-            if ($this->isSuperAdmin()){$response['workGroupSign']=true;}
-            else $response['workGroupSign']=false;
-            $response['workGroupIds']=$workGroupIds;
+            if ($this->isSuperAdmin()){$response['workgroupSign']=true;}
+            else $response['workgroupSign']=false;
+            $response['workgroupIds']=$workgroupIds;
             return $response;
         }
-        $this->authorities()->each(function(Authority $authority)use(&$workGroupIds){
-            if($authority->type=="工作组"){array_push($workGroupIds,$authority->relevance);}
+        $this->authorities()->each(function(Authority $authority)use(&$workgroupIds){
+            if($authority->type=="工作组"){array_push($workgroupIds,$authority->relevance);}
         });
-        return ["workGroupIds"=>$workGroupIds,"workGroupSign"=>true];
+        return ["workgroupIds"=>$workgroupIds,"workgroupSign"=>true];
     }
 }

resources/views/maintenance/user/index.blade.php

@@ -32,7 +32,7 @@
                                 <li v-for="role in user.roles" style="list-style: none">@{{ role.name }}</li>
                             </ul>
                         </td>
-                        <td><span v-if="user.workGroup&&user.workGroup.length>0">@{{ user.workGroup[0].name }}</span></td>
+                        <td><span v-if="user.workgroup&&user.workgroup.length>0">@{{ user.workgroup[0].name }}</span></td>
                         <td>
                             <ul v-if="user.carriers.length>0" class="list-group">
                                 <li v-for="carrier in user.carriers" style="list-style: none">@{{ carrier.name }}</li>
@@ -63,7 +63,7 @@
                     @foreach( $users as $user )
                     {id:'{{$user->id}}',name:'{{$user->name}}',email:'{{$user->email}}',
                         isSuperAdmin:'{{$user->isSuperAdmin}}',
-                        roles:{!! $user->roles !!},carriers:{!! $user->carriers !!},workGroup:{!! $user->userWorkgroups !!},created_at:'{{$user->created_at}}'},
+                        roles:{!! $user->roles !!},carriers:{!! $user->carriers !!},workgroup:{!! $user->userWorkgroups !!},created_at:'{{$user->created_at}}'},
                     @endforeach
                 ],
             },

resources/views/personnel/checking-in/clock.blade.php

@@ -14,7 +14,7 @@
                         <label for="mobile_phone" class="form-check-label col-3 pull-right">手机号：</label>
                         <input name="mobile_phone" id="mobile_phone" class="@error('mobile_phone') is-invalid @enderror col-7 form-control" type="text">
                     </div>
-                    <input hidden name="userWorkgroupID" value="{{$userWorkgroupID}}">
+                    <input name="userWorkgroupID" value="{{$userWorkgroupID}}">
                     <div class="form-group row pt-3">
                         <button type="submit" class="col-7 offset-2 btn btn-success">提交</button>
                     </div>

resources/views/personnel/checking-in/clockAudit.blade.php

@@ -19,7 +19,7 @@
                         <td>打卡类型</td>
                         @can('人事管理-打卡审核')<td>操作</td>@endcan
                         <td>工作组</td>
-                        <td v-if="workGroupSign">组长审核</td>
+                        <td v-if="workgroupSign">组长审核</td>
                         <td>异常</td>
                         <td>合计工时</td>
                     </tr>
@@ -44,7 +44,7 @@
                         </td>@endcan
                         <td class="font-weight-bold"><span v-if="userDutyCheck.user_detail.user.user_workgroups&&userDutyCheck.user_detail.user.user_workgroups.length>0">
                                 @{{ userDutyCheck.user_detail.user.user_workgroups[0].name }}</span></td>
-                        <td v-if="workGroupSign">
+                        <td v-if="workgroupSign">
                             <b v-if="userDutyCheck.group_user_id" class="text-success">已审核</b>
                             <button v-else @click="storeGroupAudit(userDutyCheck.id,userDutyCheck.type)" class="btn btn-primary w-80">组长审核</button>
                         </td>
@@ -70,7 +70,7 @@
                     exception:'',duration_man_hour:'',@if($userDutyCheck->userDetail)user_detail:{!! $userDutyCheck->userDetail !!} @endif },
                     @endforeach
                 ],
-                workGroupSign:'{{$workGroupSign}}',
+                workgroupSign:'{{$workgroupSign}}',
             },
             methods:{
                 store(id,type,url){