From fb92e4106a35545740761a2f1c71c013ec3b6f63 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 19 Oct 2023 17:01:51 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E4=BB=BB=E5=8A=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4-=E5=B8=82=E5=9C=BA=E9=83=A8=E9=95=BF=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E5=86=9C=E8=B4=B8=E5=AE=A3=E4=BC=A0=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E5=B7=A5=E4=B8=9A=E5=8A=A1=E7=9A=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=BE=E5=92=8C=E6=8B=9B=E5=95=86=E5=B7=A5=E4=BD=9C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index f4f78863e..913bfc34e 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -403,28 +403,23 @@ class TaskController extends BaseApiController
                 $this->fail('任务不存在');
             }
             $extend = [];
-            $remark = '';
             $stage = $parmas['stage']; // 当前做的是任务第几阶段
             $extend['stage'] = $stage;
             if ($stage == 1) {
                 $extend = $parmas['stage1'];
                 $extend['stage1']['is_commit'] = 1;
-                $remark = $parmas['stage1']['remark'];
             }
             if ($stage == 2) {
                 $extend = $parmas['stage2'];
                 $extend['stage2']['is_commit'] = 1;
-                $remark = $parmas['stage2']['remark'];
             }
             if ($stage == 3) {
                 $extend = $parmas['stage3'];
                 $extend['stage3']['is_commit'] = 1;
-                $remark = $parmas['stage3']['remark'];
             }
             if ($stage == 4) {
                 $extend = $parmas['stage4'];
                 $extend['stage4']['is_commit'] = 1;
-                $remark = $parmas['stage4']['remark'];
             }
 
 
@@ -461,4 +456,15 @@ class TaskController extends BaseApiController
             return $this->fail($e->getMessage());
         }
     }
+
+    public function town_task_type_marketing_director_10_detail()
+    {
+        $parmas = $this->request->param();
+        $task = TaskLogic::detail($parmas);
+        $approve = Approve::where(['task_id' =>$task['id']])->find();
+        $task['approve_status'] = $approve['check_status']; //审核状态
+        $task['deny_notes'] = $approve['remark']; // 拒绝原因
+
+        return $this->success('ok', $task);
+    }
 }