From 99e271bc31488f8e75c372a33927e7a90acc13da Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 8 Jan 2024 14:01:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/Model/Task.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php
index 55c2388..e062c16 100755
--- a/application/common/Model/Task.php
+++ b/application/common/Model/Task.php
@@ -473,14 +473,16 @@ class Task extends CommonModel
         $comments='comment';
         if($type==1){
             $data['status']=2;
+            $code= TaskStages::where('project_code',$task['project_code'])->where('name','已完成')->where('deleted',0)->value('code');
             if($task['exchange_list']){
                 $task['transferred'][]=$task['exchange_list'][0];
                 $task['assign_to']=$task['exchange_list'][0];
                 unset($task['exchange_list'][0]);
-                Db::name('task')->where('id',$task['id'])->update($data);
+               $res= Db::name('task')->where('id',$task['id'])->update($data);
             }else{
                 $data['status']=1;
-                Db::name('task')->where('id',$task['id'])->update($data);
+                $data['stage_code']=$code;
+                $res=  Db::name('task')->where('id',$task['id'])->update($data);
             }
             $comments='pass';
         }elseif($type==2){
@@ -828,7 +830,7 @@ class Task extends CommonModel
         if (!isset($data['status'])) {
             $data['status'] = 0;
         }
-        $status = [0 => '未开始', 1 => '已完成', 2 => '进行中', 3 => '挂起', 4 => '测试中'];
+        $status = [0 => '未开始', 1 => '已完成', 2 => '进行中', 3 => '挂起', 4 => '验收中'];
         return $status[$data['status']];
     }