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()]);