This commit is contained in:
mkm 2024-01-12 17:02:35 +08:00
parent 9863aca4ed
commit 957a86ec2a

View File

@ -525,9 +525,8 @@ class Task extends CommonModel
$data['exchange_list']=''; $data['exchange_list']='';
} }
TaskMember::inviteMember($executorCode, $taskCode, 1); TaskMember::inviteMember($executorCode, $taskCode, 1);
$code= TaskStages::where('project_code',$task['project_code'])->where('name','验收中')->where('deleted',0)->value('code'); $code= TaskStages::where('project_code',$task['project_code'])->where('name','进行中')->where('deleted',0)->value('code');
$data['stage_code']=$code; $data['stage_code']=$code;
$data['status']=4;
self::where('id',$task['id'])->update($data); self::where('id',$task['id'])->update($data);
}else{ }else{
$code= TaskStages::where('project_code',$task['project_code'])->where('name','已完成')->where('deleted',0)->value('code'); $code= TaskStages::where('project_code',$task['project_code'])->where('name','已完成')->where('deleted',0)->value('code');
@ -544,8 +543,10 @@ class Task extends CommonModel
self::name('task')->where('id',$task['id'])->update($data); self::name('task')->where('id',$task['id'])->update($data);
}elseif($type==3){ }elseif($type==3){
$comments='add'; $comments='add';
// $data['status']=4; $code= TaskStages::where('project_code',$task['project_code'])->where('name','验收中')->where('deleted',0)->value('code');
// self::name('task')->where('id',$task['id'])->update($data); $data['stage_code']=$code;
$data['status']=4;
self::name('task')->where('id',$task['id'])->update($data);
} }
self::taskHook(getCurrentMember()['code'], $taskCode, $comments, '', 1, '', $comment, '', $mentions); self::taskHook(getCurrentMember()['code'], $taskCode, $comments, '', 1, '', $comment, '', $mentions);