generated from liutk/owl-admin-base
Update
parent
93c7ffda48
commit
2d0d685172
|
|
@ -66,15 +66,23 @@ class OvertimeApplyService extends BaseService
|
|||
}
|
||||
if (isset($data['datetime_range'])) {
|
||||
$time = explode(',', $data['datetime_range']);
|
||||
$start = Carbon::createFromTimestamp(data_get($time, 0));
|
||||
$end = Carbon::createFromTimestamp(data_get($time, 1));
|
||||
$start = Carbon::createFromTimestamp(data_get($time, 0))->startOfMinute();
|
||||
$end = Carbon::createFromTimestamp(data_get($time, 1))->startOfMinute();
|
||||
$data['start_at'] = $start;
|
||||
$data['end_at'] = $end;
|
||||
$data['date'] = $start->format('Y-m-d');
|
||||
}
|
||||
if (isset($data['start_at']) && isset($data['end_at'])) {
|
||||
$start = $data['start_at'] instanceof \DateTime ? $data['start_at'] : Carbon::parse($data['start_at']);
|
||||
$end = $data['end_at'] instanceof \DateTime ? $data['end_at'] : Carbon::parse($data['end_at']);
|
||||
$start = $data['start_at'];
|
||||
if (! $start instanceof Carbon) {
|
||||
$start = Carbon::parse($start)->startOfMinute();
|
||||
}
|
||||
|
||||
$end = $data['end_at'];
|
||||
if (! $end instanceof Carbon) {
|
||||
$end = Carbon::parse($end)->startOfMinute();
|
||||
}
|
||||
|
||||
$data['hours'] = $start->diffInHours($end);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue