Commit 97f59ad5 authored by wangzhengwen's avatar wangzhengwen

项目完成状态

parent c9e6154e
...@@ -152,9 +152,11 @@ class Project extends BaseController ...@@ -152,9 +152,11 @@ class Project extends BaseController
} }
$data = $request->param(); $data = $request->param();
$count = ProjectPut::where(['id'=>$data['project_put_id'],'user_id'=>$request->userId,'complete_status'=>0])->count(); $projectPutData = ProjectPut::where(['id'=>$data['project_put_id'],'user_id'=>$request->userId,'complete_status'=>0])
->lock(true)
->find();
if (!$count) if (!$projectPutData)
{ {
return $this->returnMsg('项目不存在或已有提交记录'); return $this->returnMsg('项目不存在或已有提交记录');
} }
...@@ -162,6 +164,9 @@ class Project extends BaseController ...@@ -162,6 +164,9 @@ class Project extends BaseController
$update = ['complete_status'=>1,'complete_post_time'=>time(),'complete_file_id_str'=>$data['complete_file_id_str']]; $update = ['complete_status'=>1,'complete_post_time'=>time(),'complete_file_id_str'=>$data['complete_file_id_str']];
ProjectPut::where('id',$data['project_put_id'])->update($update); ProjectPut::where('id',$data['project_put_id'])->update($update);
// 将项目状态改为3 待验收
ProjectModel::where(['id'=>$projectPutData['project_id']])->update(['status' => 3]);
return $this->returnMsg('success',1); return $this->returnMsg('success',1);
} }
......
...@@ -47,8 +47,6 @@ class ProjectPut extends BaseController ...@@ -47,8 +47,6 @@ class ProjectPut extends BaseController
(new ProjectPutModel())->putProject($data,$request->userId); (new ProjectPutModel())->putProject($data,$request->userId);
//将项目状态改为3 待验收
ProjectModel::where(['id'=>$data['project_id']])->update(['status' => 3]);
return $this->returnMsg('success',1); return $this->returnMsg('success',1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment