pdkj
/
store-manage
generated from liutk/owl-admin-base
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

main
Jing Li 2024-04-30 21:05:59 +08:00
parent 93c7ffda48
commit 2d0d685172
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Admin/Services/OvertimeApplyService.php
View File

@ -66,15 +66,23 @@ class OvertimeApplyService extends BaseService
} }
if (isset($data['datetime_range'])) { if (isset($data['datetime_range'])) {
$time = explode(',', $data['datetime_range']); $time = explode(',', $data['datetime_range']);
$start = Carbon::createFromTimestamp(data_get($time, 0)); $start = Carbon::createFromTimestamp(data_get($time, 0))->startOfMinute();
$end = Carbon::createFromTimestamp(data_get($time, 1)); $end = Carbon::createFromTimestamp(data_get($time, 1))->startOfMinute();
$data['start_at'] = $start; $data['start_at'] = $start;
$data['end_at'] = $end; $data['end_at'] = $end;
$data['date'] = $start->format('Y-m-d'); $data['date'] = $start->format('Y-m-d');
} }
if (isset($data['start_at']) && isset($data['end_at'])) { if (isset($data['start_at']) && isset($data['end_at'])) {
$start = $data['start_at'] instanceof \DateTime ? $data['start_at'] : Carbon::parse($data['start_at']); $start = $data['start_at'];
$end = $data['end_at'] instanceof \DateTime ? $data['end_at'] : Carbon::parse($data['end_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); $data['hours'] = $start->diffInHours($end);
} }