From 560562755bad5971ca508cf58c6b390ac91bb197 Mon Sep 17 00:00:00 2001
From: ganzizi <zhicheng123@126.com>
Date: Wed, 5 Jul 2023 17:54:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=BC=BA=E5=B0=91=202.=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=AF=BC=E5=87=BA=E5=B0=8F=E6=97=B6=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E8=AF=AF=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ApproveController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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