提交

application/api/controller/Approve.php

@@ -143,13 +143,15 @@ class Approve extends Base
      * @Apidoc\Param("approve_id", type="integer",require=true, desc="审批ID")
      * @Apidoc\Param("status", type="integer",require=true, desc="审批状态:3=审批同意,4=审批驳回")
      * @Apidoc\Param("remark", type="sting",require=false, desc="审批意见")
+     * @Apidoc\Param("maintain_user_id", type="sting",require=false, desc="维修人员ID")
      **/
     public function audit()
     {
         $id = input('approve_id');
         $status = input('status', 0);
         $remark = input('remark', '');
-        $params = compact("id", "status", "remark");
+        $maintain_user_id = input('maintain_user_id', 0);
+        $params = compact("id", "status", "remark","maintain_user_id");
         $user = $this->user;
         ApproveService::make($id, $params, $user, 'audit');
         $this->success('确认成功');

application/common/service/ApproveInfoService.php

@@ -592,6 +592,7 @@ class ApproveInfoService
             if (!array_key_exists($status, CommonConstant::get_status_list())) {
                 return [];
             }
+            $type = 0;
         } else {
             $module = CommonConstant::MODULE_1;
             $status = CommonConstant::STATUS_3;
@@ -613,7 +614,7 @@ class ApproveInfoService
             ->when(!empty($search), function ($query) use ($search) {
                 $query->where('order_no|reason', 'like', '%' . $search . '%');
             })
-            ->when(isset($type), function ($query) use ($type) {
+            ->when($type > 0, function ($query) use ($type) {
                 $query->where('type', $type);
             });
         $list = self::get_with($list, $module, $status);

application/common/service/ApproveService.php

@@ -317,7 +317,7 @@ class ApproveService
     public static function make($id, $params, $user, $type)
     {
         $userid = $user['userid'];
-        $approve = Approve::field('id,info_id,status,approve_flow,approve_user,approve_time')
+        $approve = Approve::field('id,info_id,status,approve_user,approve_flow,approve_time')
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
             ->where('group', CommonConstant::IS_WHO_0)
             ->where('state', CommonConstant::IS_WHO_0)