diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index e2fe3f3a2..99aea5e31 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -406,16 +406,20 @@ class TaskController extends BaseApiController $stage = $parmas['stage']; // 当前做的是任务第几阶段 $extend['stage'] = $stage; if ($stage == 1) { - $extend['stage1'] = $parmas['stage1']; + $extend['stage1']['file'] = $parmas['stage1']; + $extend['stage1']['remark'] = $parmas['remark']; } if ($stage == 2) { - $extend['stage2'] = $parmas['stage2']; + $extend['stage2']['file'] = $parmas['stage2']; + $extend['stage2']['remark'] = $parmas['remark']; } if ($stage == 3) { - $extend['stage3'] = $parmas['stage3']; + $extend['stage3']['file'] = $parmas['stage3']; + $extend['stage3']['remark'] = $parmas['remark']; } if ($stage == 4) { - $extend['stage4'] = $parmas['stage4']; + $extend['stage4']['file'] = $parmas['stage4']; + $extend['stage4']['remark'] = $parmas['remark']; } // Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time(), 'director_uid'=>$this->userId]); // director_uid 指派人 @@ -442,7 +446,6 @@ class TaskController extends BaseApiController $approveModel->create_time = time(); $approveModel->update_time = time(); $re = $approveModel->save(); - } else { // 有则更新状态 $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核