1

application/api/controller/UserCar.php

@@ -280,7 +280,7 @@ class UserCar extends Base
      * @title 审批请假记录
      * @desc 审批请假记录
      * @author qc
-     * @url /api/User_car/approveLeave
+     * @url /api/User_car/approveCar
      * @method POST
      * @tag
      * @header name:Authorization require:1 desc:Token

application/common.php

@@ -1,6 +1,27 @@
 <?php
 use think\Db;
 
+/**
+ * 秒转换为天
+ */
+function get_stay_time($remain_time, $is_hour = 1, $is_minutes = 1)
+{
+    $day = floor($remain_time / (3600*24));
+    $day = $day > 0 ? $day.'天' : '';
+    $hour = floor(($remain_time % (3600*24)) / 3600);
+    $hour = $hour > 0 ? $hour.'小时' : '';
+    if($is_hour && $is_minutes) {
+        $minutes = floor((($remain_time % (3600*24)) % 3600) / 60);
+        $minutes = $minutes > 0 ? $minutes.'分钟' : '';
+        return $day.$hour.$minutes;
+    }
+
+    if($hour) {
+        return $day.$hour;
+    }
+    return $day;
+}
+
 // 获取模板区域
 function get_city_area()
 {

application/common/service/ApproveService.php

@@ -43,6 +43,7 @@ class ApproveService
             $approve_update['approve_time'] = date('Y-m-d H:i:s');
             $approve_time = time() - strtotime($approve_info['start_time']);
             $approve_update['time'] = $approve_time;
+            $approve_update['time_desc'] = get_stay_time($approve_time);
             LeaveApprove::where('id',$approve_id)->update($approve_update);// 更新审批记录
             $leave_data = [];
             // 审批流程数 + 1
@@ -90,6 +91,7 @@ class ApproveService
             $approve_update['approve_time'] = date('Y-m-d H:i:s');
             $approve_time = time() - strtotime($approve_info['start_time']);
             $approve_update['time'] = $approve_time;
+            $approve_update['time_desc'] = get_stay_time($approve_time);
             CarApprove::where('id',$approve_id)->update($approve_update);// 更新审批记录
             $car_data = [];
             // 审批流程数 + 1
@@ -101,7 +103,7 @@ class ApproveService
             } else if($approve_info['flow'] == $car_info['approve_num']) {
                 $car_data['status'] = $status;
             }
-            LeaveInfo::where('id',$car_info['id'])->update($car_data);// 更新用车申请状态
+            CarInfo::where('id',$car_info['id'])->update($car_data);// 更新用车申请状态
             Db::commit();
         }catch (\Exception $e) {
             Db::rollback();