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

add:任务10提交接口，新增说明字段

Browse Source
This commit is contained in:
chenbo 2023-10-18 18:00:21 +08:00
parent f75900d0b8
commit f3467e9dd8
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/api/controller/TaskController.php
View File

@ -326,7 +326,7 @@ class TaskController extends BaseApiController
$areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager'); $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
// 没有则创建审批任务 // 没有则创建审批任务
$approveModel = Approve::where(['task_id' => $task['id']])->find(); $approveModel = Approve::where(['task_id' => $task['id']])->findOrEmpty();
if ($approveModel->isEmpty()) { if ($approveModel->isEmpty()) {
$approveModel->type = Approve::APPROVE_TYPE_1; $approveModel->type = Approve::APPROVE_TYPE_1;
$approveModel->flow_id = 1; $approveModel->flow_id = 1;
@ -340,7 +340,7 @@ class TaskController extends BaseApiController
$approveModel->other_type = 6; $approveModel->other_type = 6;
$approveModel->create_time = time(); $approveModel->create_time = time();
$approveModel->update_time = time(); $approveModel->update_time = time();
$approveModel->save(); $approveModel->strict(false)->save();
} else { } else {
// 有则更新状态 // 有则更新状态
$approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核 $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
@ -402,7 +402,6 @@ class TaskController extends BaseApiController
if (empty($task)) { if (empty($task)) {
$this->fail('任务不存在'); $this->fail('任务不存在');
} }
Db::startTrans();
$extend = []; $extend = [];
$stage = $parmas['stage']; // 当前做的是任务第几阶段 $stage = $parmas['stage']; // 当前做的是任务第几阶段
$extend['stage'] = $stage; $extend['stage'] = $stage;
@ -424,6 +423,7 @@ class TaskController extends BaseApiController
// 片区经理 // 片区经理
$areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager'); $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
// 没有则创建审批任务 // 没有则创建审批任务
$approveModel = Approve::where(['task_id' => $task['id']])->findOrEmpty(); $approveModel = Approve::where(['task_id' => $task['id']])->findOrEmpty();
if ($approveModel->isEmpty()) { if ($approveModel->isEmpty()) {
@ -441,17 +441,14 @@ class TaskController extends BaseApiController
$approveModel->remark = $parmas['remark']; $approveModel->remark = $parmas['remark'];
$approveModel->create_time = time(); $approveModel->create_time = time();
$approveModel->update_time = time(); $approveModel->update_time = time();
$approveModel->save(); $approveModel->strict(false)->save();
} else { } else {
// 有则更新状态 // 有则更新状态
$approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核 $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
$approveModel->save(); $approveModel->save();
} }
Db::commit();
return $this->success('ok', []); return $this->success('ok', []);
} catch (Exception $e) { } catch (Exception $e) {
Db::rollback();
return $this->fail($e->getMessage()); return $this->fail($e->getMessage());
} }
} }