hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修正流程引擎多人执行模式bug

Browse Source
This commit is contained in:
hawind
2021-04-13 00:01:21 +08:00
parent de8a7e82be
commit d5da54b817
27 changed files with 2383 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Model/Form.php
+33 -28
View File
@@ -2305,12 +2305,6 @@ class Form
// 主表数据
$master = $gets[$table];
// 审核完成时执行
if ($gets['step_next_type'] == 'end') {
$_data = Hook::fire($table.'.onBeforeAudit', ['table' => $table, 'master' => $master, 'id' => $master['id']]);
extract($_data);
}
/*
back 退回
draft 草稿
@@ -2322,21 +2316,6 @@ class Form
if ($bill['audit_type'] == 1) {
if ($gets['step_next_type']) {
// 设置流程主表状态
switch ($gets['step_next_type']) {
case 'next':
$master['status'] = '2';
break;
case 'back':
$master['status'] = '-2';
break;
case 'end':
$master['status'] = '1';
break;
}
}
$run = DB::table('model_run')
->where('bill_id', $bill['id'])
->where('data_id', $id)
@@ -2469,6 +2448,39 @@ class Form
break;
}
if ($gets['step_next_type']) {
// 设置流程主表状态
switch ($gets['step_next_type']) {
case 'next':
$master['status'] = '2';
break;
case 'back':
$master['status'] = '-2';
break;
case 'end':
$master['status'] = '1';
break;
}
}
// 结束节点时执行
if ($gets['step_next_type'] == 'end') {
// 结束流程时最后一个办理(针对多人执行)
if ($next_step_write) {
// 设置生效数据
$_run['actived_id'] = $auth['id'];
$_run['actived_by'] = $auth['name'];
$_run['actived_at'] = time();
// 生效时执行事件
$_data = Hook::fire($table.'.onBeforeAudit', ['table' => $table, 'master' => $master, 'id' => $master['id']]);
extract($_data);
} else {
// 结束节点不结束流程
$master['status'] = '2';
}
}
// 更新自己已办日志
DB::table('model_run_log')
->where('run_id', $run_id)
@@ -2592,13 +2604,6 @@ class Form
$_run['partner_type'] = 'supplier';
}
// 流程结束时设置运行主表
if ($gets['step_next_type'] == 'end') {
$_run['actived_id'] = $auth['id'];
$_run['actived_by'] = $auth['name'];
$_run['actived_at'] = time();
}
DB::table('model_run')
->where('id', $run_id)
->update($_run);