From 3c6e6a6e2cf1637065d2e3dbc81afbe67cea7bac Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 9 Jan 2024 10:25:47 +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 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php
index cb63644..2e2b01f 100755
--- a/application/common/Model/Task.php
+++ b/application/common/Model/Task.php
@@ -295,6 +295,8 @@ class Task extends CommonModel
                     $parentTask['path'] && $parentTask['path'] = ",{$parentTask['path']}";
                     $path = "{$parentTask['code']}{$parentTask['path']}";
                 }
+                $code= TaskStages::where('project_code',$projectCode)->where('name','进行中')->where('deleted',0)->value('code');
+
                 $data = [
                     'create_time' => nowTime(),
                     'code' => createUniqueCode('task'),
@@ -305,7 +307,7 @@ class Task extends CommonModel
                     'project_code' => $projectCode,
                     'pcode' => $parentCode,
                     'path' => $path,
-                    'stage_code' => $stageCode,
+                    'stage_code' => $code,
                     'pri' => $pri,
                     'description' => $description,
                     'begin_time' => $beginTime,
@@ -483,14 +485,18 @@ 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']){
+                $code= TaskStages::where('project_code',$task['project_code'])->where('name','已完成')->where('deleted',0)->value('code');
+
                 $task['transferred'][]=$task['exchange_list'][0];
                 $task['assign_to']=$task['exchange_list'][0];
                 unset($task['exchange_list'][0]);
                $res= self::where('id',$task['id'])->update($data);
             }else{
+                $code= TaskStages::where('project_code',$task['project_code'])->where('name','已完成')->where('deleted',0)->value('code');
                 $data['status']=1;
+                $data['done']=1;
+                $data['execute_status']='done';
                 $data['stage_code']=$code;
 
                 $res=  self::name('task')->where('id',$task['id'])->update($data);