完善人事管理录入补卡相关逻辑

app/Http/Controllers/PersonnelController.php

@@ -87,7 +87,8 @@ class PersonnelController extends Controller
         $type=$request->input('type');
         $userDutyCheck->type=$type;
         $userDutyCheck->group_user_id=Auth::user()['id'];
-        $laborReport=LaborReport::where('user_id',$userDutyCheck->user_id)->where('user_workgroup_id',$workgroup->id)->where('check_in_at',$userDutyCheck->checked_at)->first();
+        $checkInDate=Carbon::parse($userDutyCheck->checked_at)->format('Y-m-d');
+        $laborReport=LaborReport::where('user_id',$userDutyCheck->user_id)->where('user_workgroup_id',$workgroup->id)->where('created_at','like',$checkInDate."%")->first();
         $userDutyCheck->update();
         $this->updateLaborReportVerify($laborReport,$userDutyCheck);
         $this->log(__METHOD__,"打卡组长审核".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
@@ -189,9 +190,11 @@ class PersonnelController extends Controller
         $checkInDate=Carbon::parse($checked_at)->format('Y-m-d');
         $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('check_in_at','like',$checkInDate."%")->where('user_id',$user_id)->first();
         if(!$laborReport&&$userDutyCheck->type=='登入'){
-            LaborReport::createLaborReportData($user_id,$userWorkgroupID,$userDutyCheck);
+            $laborReport=LaborReport::createLaborReportData($user_id,$userWorkgroupID,$userDutyCheck);
+            $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
         }else if ($laborReport&&$userDutyCheck->type=='登出'){
-            LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
+            $laborReport=LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
+            $this->log(__METHOD__,"更新临时工报表记录__".__FUNCTION__,json_encode($laborReport));
         }
         $this->log(__METHOD__,"录入补卡".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
         return ['success'=>true,'data'=>$userDutyCheck];

app/Http/Controllers/UserDutyCheckController.php

@@ -50,9 +50,11 @@ class UserDutyCheckController extends Controller
             //正常情况
             $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',Carbon::now()->format('Y-m-d')."%")->where('user_id',$userDetail->user_id)->first();
             if(!isset($laborReport)&&$userDutyCheck->type=='登入'){
-                LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
+                $laborReport=LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
+                $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
             }else if ($laborReport&&$userDutyCheck->type=='登出'){
-                LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
+                $laborReport= LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
+                $this->log(__METHOD__,"更新临时工报表记录__".__FUNCTION__,json_encode($laborReport));
             }
             if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
             if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
@@ -89,9 +91,11 @@ class UserDutyCheckController extends Controller
         //正常情况
         $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',$dateNow."%")->where('user_id',$userDetail->user_id)->first();
         if(!$laborReport&&$userDutyCheck->type=='登入'){
-            LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
+            $laborReport=LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
+            $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
         }else if ($laborReport&&$userDutyCheck->type=='登出'){
-            LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
+            $laborReport=LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
+            $this->log(__METHOD__,"更新临时工报表记录__".__FUNCTION__,json_encode($laborReport));
         }
         if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
         if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
@@ -128,7 +132,8 @@ class UserDutyCheckController extends Controller
         $this->log(__METHOD__,"更改临时工劳务所信息".__FUNCTION__,json_encode($userLabor),Auth::user()['id']);
         $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
         //添加临时工报表数据
-        LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
+        $laborReport=LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
+        $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
         if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
         if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
         $user=User::find($userDetail->user_id);
@@ -171,7 +176,8 @@ class UserDutyCheckController extends Controller
         $userLabor->save();
         $this->log(__METHOD__,"提交临时工对应劳务所信息__".__FUNCTION__,json_encode($userLabor));
         $userDutyCheck=$this->dutyCheck($user->id,$userWorkgroupID);
-        LaborReport::createLaborReportData($user->id,$userWorkgroupID,$userDutyCheck);
+        $laborReport=LaborReport::createLaborReportData($user->id,$userWorkgroupID,$userDutyCheck);
+        $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
         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'));

app/LaborReport.php

@@ -49,8 +49,7 @@ class LaborReport extends Model
         $enter_number=$userWorkgroupID.date ("ymd").str_pad($number_id>99999?$number_id%99999:$number_id,4,"0",STR_PAD_LEFT);
         $laborReport->enter_number=$enter_number;
         $laborReport->update();
-        //$this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
-        return;
+        return $laborReport;
     }
     //修改临时工报表数据
     static function updateLaborReportData($laborReport,$userDutyCheck){
@@ -73,7 +72,6 @@ class LaborReport extends Model
             $laborReport['working_duration']=$hour-$lunchHour;
             $laborReport->update();
         }
-        //$this->log(__METHOD__,__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
-        return;
+        return $laborReport;
     }
 }

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

@@ -19,9 +19,6 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <td>
-                            <span class="text-muted">每页显示记录：</span>
-                        </td>
                         <td colspan="3">
                             <select name="paginate" v-model="filterData.paginate" class="tooltipTarget form-control-sm" style="vertical-align: middle" @change="submit">
                                 <option value="50">50行</option>
@@ -33,14 +30,11 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <td style="width: 200px">
-                            <span class="text-muted">根据条件过滤：</span>
-                        </td>
                         <td class="col" style="width: 220px">
                             <div class="col p-0">
-                                <input v-model="filterData.start_date" :class="filterData.start_date?'bg-warning':''" name="start_date" type="date" class="form-control-sm m-0 col-7 tooltipTarget" title="选择显示指定日期的开始时间" style="width: 130px">
+                                <input v-model="filterData.start_date" :class="filterData.start_date?'bg-warning':''" name="start_date" type="date" class="form-control-sm m-0 col-8 tooltipTarget" title="选择显示指定日期的开始时间" style="width: 130px">
                             </div>
-                            <input v-model="filterData.end_date" :class="filterData.end_date?'bg-warning':''" name="end_date" type="date" class="form-control-sm col-7 offset-md-0 mt-2 tooltipTarget" title="选择显示指定日期的结束时间" style="width: 130px">
+                            <input v-model="filterData.end_date" :class="filterData.end_date?'bg-warning':''" name="end_date" type="date" class="form-control-sm col-8 offset-md-0 mt-2 tooltipTarget" title="选择显示指定日期的结束时间" style="width: 130px">
                         </td>
                         <td style="width: 220px">
                             <input v-model="filterData.full_name" :class="filterData.full_name?'bg-warning':''" name="full_name" class="form-control-sm" type="text" placeholder="姓名">

resources/views/personnel/laborReport/index.blade.php

@@ -18,9 +18,7 @@
                                     </div></td>
                             </tr>
                             <tr>
-                                <td>
-                                    <span class="text-muted">每页显示记录：</span>
-                                </td>
+
                                 <td  colspan="9">
                                     <select name="paginate" v-model="filterData.paginate" class="tooltipTarget form-control-sm" style="vertical-align: middle" @change="setPaginate">
                                         <option value="50">50行</option>
@@ -31,9 +29,6 @@
                                     </select></td>
                             </tr>
                             <tr>
-                                <td rowspan="2">
-                                    <span class="text-muted">根据条件过滤：</span>
-                                </td>
                                 <td >
                                     <input style="width: 150px" name="created_at_start" type="date" v-model="filterData.created_at_start" :class="filterData.created_at_start?'bg-warning':''" class="form-control-sm tooltipTarget" title="选择显示指定日期的起始时间">
 
@@ -65,9 +60,6 @@
                                     <input type="text"  name="mobile_phone" class="form-control-sm  tooltipTarget" v-model="filterData.mobile_phone"  :class="filterData.mobile_phone?'bg-warning':''" style="vertical-align: middle" placeholder="电话号"></td>
                             </tr>
                             <tr>
-                                <td>
-                                    <span class="text-muted">操作选定记录：</span>
-                                </td>
                                 <td colspan="9">
                                     <span class="dropdown">
                                         <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData>0?'btn-dark text-light':'']"