mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-01-08 14:01:44 +08:00
parent 3f49569d8d
commit 99e271bc31
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/common/Model/Task.php
View File

@ -473,14 +473,16 @@ class Task extends CommonModel
$comments='comment'; $comments='comment';
if($type==1){ if($type==1){
$data['status']=2; $data['status']=2;
$code= TaskStages::where('project_code',$task['project_code'])->where('name','已完成')->where('deleted',0)->value('code');
if($task['exchange_list']){ if($task['exchange_list']){
$task['transferred'][]=$task['exchange_list'][0]; $task['transferred'][]=$task['exchange_list'][0];
$task['assign_to']=$task['exchange_list'][0]; $task['assign_to']=$task['exchange_list'][0];
unset($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{ }else{
$data['status']=1; $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'; $comments='pass';
}elseif($type==2){ }elseif($type==2){
@ -828,7 +830,7 @@ class Task extends CommonModel
if (!isset($data['status'])) { if (!isset($data['status'])) {
$data['status'] = 0; $data['status'] = 0;
} }
$status = [0 => '未开始', 1 => '已完成', 2 => '进行中', 3 => '挂起', 4 => '测试中']; $status = [0 => '未开始', 1 => '已完成', 2 => '进行中', 3 => '挂起', 4 => '验收中'];
return $status[$data['status']]; return $status[$data['status']];
} }