临时工报表发现问题改善

app/LaborReport.php

@@ -78,13 +78,6 @@ class LaborReport extends Model
         }
         if ($userDutyCheck->type=='登入'&&$userDutyCheckOld->checked_at<$userDutyCheck->checked_at){
             $userDutyCheck->save();
-//            $userDutyCheckStart=UserDutyCheck::where('user_id',$laborReport->user_id)->where('workgroup_id',$laborReport->user_workgroup_id)->where('checked_at','>=',$date." 11:00".":00")
-//                ->where('checked_at','<=',$date." 14:00:00")->where('type','登出')->first();
-//            $userDutyCheckEnd=UserDutyCheck::where('user_id',$laborReport->user_id)->where('workgroup_id',$laborReport->user_workgroup_id)->where('type','登入')->where('checked_at','>=',$date." 11:00".":00")
-//                ->where('checked_at','<=',$date." 14:00:00")->first();
-//            $beginTime=Carbon::parse($userDutyCheckStart['checked_at']);
-//            $endTime=Carbon::parse($userDutyCheckEnd['checked_at']);
-//            $lunchHour=($endTime->diffInSeconds($beginTime))/3600;
             $laborReport['working_duration']=$laborReport['online_duration'];
             $laborReport->update();
         }
@@ -106,7 +99,11 @@ class LaborReport extends Model
             $beginTime=Carbon::parse($userDutyCheckStart['checked_at']);
             $endTime=Carbon::parse($userDutyCheckEnd['checked_at']);
             $lunchHour=($endTime->diffInSeconds($beginTime))/3600;
-            $laborReport['working_duration']=$laborReport['online_duration']-$lunchHour;
+            if($userDutyCheck->type=='登入'&&$userDutyCheck->checked_at<=$date." 14:00:00"){
+                $laborReport['working_duration']=$laborReport['online_duration'];
+            }else{
+                $laborReport['working_duration']=$laborReport['online_duration']-$lunchHour;
+            }
             $laborReport->update();
         }
         return;