|
|
@@ -274,16 +274,15 @@ class UserDutyCheckController extends Controller
|
|
|
}
|
|
|
//修改临时工报表数据
|
|
|
public function updateLaborReportData($laborReport,$userDutyCheck){
|
|
|
- $check_in_at=$laborReport['check_in_at'];
|
|
|
$laborReport->check_out_at=$userDutyCheck->checked_at;
|
|
|
- $checkInDate=Carbon::parse($check_in_at);
|
|
|
+ $checkInDate=Carbon::parse($laborReport['check_in_at']);
|
|
|
$checkOutDate=Carbon::parse($userDutyCheck->checked_at);
|
|
|
$hour=($checkOutDate->diffInSeconds($checkInDate))/3600; //在线时长
|
|
|
$laborReport['online_duration']=$hour;
|
|
|
$laborReport['working_duration']=$hour;
|
|
|
$laborReport->update();
|
|
|
- $date=Carbon::parse($laborReport->check_in_at)->format('Y-m-d');
|
|
|
- if ($userDutyCheck->checked_at>$date." 14:00:00"){
|
|
|
+ $date=Carbon::parse($laborReport['check_in_at'])->format('Y-m-d');
|
|
|
+ if ($laborReport->check_out_at>$date." 14:00:00"){
|
|
|
$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('checked_at','>=',$date." 11:00".":00")
|
haozi
