diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 7a8e422bb..f4f78863e 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -408,22 +408,27 @@ class TaskController extends BaseApiController $extend['stage'] = $stage; if ($stage == 1) { $extend = $parmas['stage1']; + $extend['stage1']['is_commit'] = 1; $remark = $parmas['stage1']['remark']; } if ($stage == 2) { $extend = $parmas['stage2']; + $extend['stage2']['is_commit'] = 1; $remark = $parmas['stage2']['remark']; } if ($stage == 3) { $extend = $parmas['stage3']; + $extend['stage3']['is_commit'] = 1; $remark = $parmas['stage3']['remark']; } if ($stage == 4) { $extend = $parmas['stage4']; + $extend['stage4']['is_commit'] = 1; $remark = $parmas['stage4']['remark']; } -// Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time(), 'director_uid'=>$this->userId]); // director_uid 指派人 + + Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time(), 'director_uid'=>$this->userId]); // director_uid 指派人 // 片区经理 $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager'); @@ -443,7 +448,6 @@ class TaskController extends BaseApiController $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核 $approveModel->other_type = 6; $approveModel->extend = json_encode($extend); - $approveModel->remark = $remark; $approveModel->create_time = time(); $approveModel->update_time = time(); $re = $approveModel->save();