haozi 4 anni fa
parent
commit
4fe23c2cd2
1 ha cambiato i file con 5 aggiunte e 1 eliminazioni
  1. 5 1
      app/Http/Controllers/PersonnelController.php

+ 5 - 1
app/Http/Controllers/PersonnelController.php

@@ -132,7 +132,11 @@ class PersonnelController extends Controller
                 ]);
                 $userDutyCheckBefore=UserDutyCheck::query()->where('user_id',$user_id)->where('checked_at','like',$checkedAtDate.'%')->orderBy('id','desc')->first();
 //                if ($userDutyCheckBefore['type']=='登入'&&$userDutyCheck->type=='登入')return ['result'=>true,'data'=>'已存在进场记录!'];
-                if ($laborReport && $userDutyCheck->type=='登入')return ['result'=>true,'data'=>'已存在进场记录!'];
+                if ($laborReport){
+                    $laborReportCreatedAt=Carbon::parse($laborReport->created_at)->format('Y-m-d');
+                    if ($laborReportCreatedAt==$checkedAtDate && $userDutyCheck->type=='登入')return ['result'=>true,'data'=>'已存在进场记录!'];
+                }
+
                 if ($userDutyCheckBefore['type']=='登出'&&$userDutyCheck->type=='登出'){
                     LaborReportStatus::query()->updateOrCreate([
                         'labor_report_id'=>$laborReport->id,