github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 1.修复审核导出缺少 2.修复审核导出小时计算误差

Browse Source
This commit is contained in:
ganzizi 2023-07-05 17:54:42 +08:00
parent aebd47e535
commit 560562755b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/ApproveController.php
View File

@ -731,7 +731,7 @@ class ApproveController extends AbstractController
$data['isFinished'] = intval(Request::input('is_finished')); //是否完成 $data['isFinished'] = intval(Request::input('is_finished')); //是否完成
$date = Request::input('date'); $date = Request::input('date');
$data['startTime'] = $date[0]; //开始时间 $data['startTime'] = $date[0]; //开始时间
$data['endTime'] = $date[1]; //结束时间 $data['endTime'] =Carbon::parse($date[1])->addDay()->toDateString(); //结束时间 + 1天
// //
if (empty($name) || empty($date)) { if (empty($name) || empty($date)) {
return Base::retError('参数错误'); return Base::retError('参数错误');
@ -800,7 +800,7 @@ class ApproveController extends AbstractController
// 计算时长 // 计算时长
$varStartTime = Carbon::parse($val['var']['start_time']); $varStartTime = Carbon::parse($val['var']['start_time']);
$varEndTime = Carbon::parse($val['var']['end_time']); $varEndTime = Carbon::parse($val['var']['end_time']);
$duration = $varEndTime->diffInHours($varStartTime); $duration = $varEndTime->floatDiffInHours($varStartTime);
$duration_unit = '小时'; // 时长单位 $duration_unit = '小时'; // 时长单位
$datas[] = [ $datas[] = [
$val['id'], // 申请编号 $val['id'], // 申请编号