From 03af4b59d25245a2ff45262af78b4385e1b4b6a2 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 16 Sep 2023 10:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BB=BB=E5=8A=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81=E5=92=8C?=
 =?UTF-8?q?=E6=8B=92=E7=BB=9D=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/TaskController.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 925c3153c..3f831fd3c 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -213,6 +213,9 @@ class TaskController extends BaseApiController
     public function other_task_detail(){
         $parmas = $this->request->param();
         $task = TaskLogic::detail($parmas);
+        $approve = Approve::where(['task_id' =>$task['id']])->find();
+        $task['approve_status'] = $approve['status']; //审核状态
+        $task['deny_notes'] = $approve['remark']; // 拒绝原因
         return $this->success('ok', $task);
     }
 
@@ -222,12 +225,12 @@ class TaskController extends BaseApiController
     public function cimmit_other_task()
     {
         try {
-            $parmas = $this->request->param(); //id note annex
+            $parmas = $this->request->param(); //id note annex vedio_annex
             $task = TaskLogic::detail($parmas);
             if (empty($task)) {
                 $this->fail('任务不存在');
             }
-            $extend = ['other' => ['is_commit' => 1, 'note' => $parmas['note'], 'annex'=>$parmas['annex']]];
+            $extend = ['other' => ['is_commit' => 1, 'note' => $parmas['note'], 'annex'=>$parmas['annex'], 'video_annex' => $parmas['video_annex']]];
             Db::startTrans();
             Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time()]);