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/Workflow/Controllers/BillController.php
+248
View File
@@ -0,0 +1,248 @@
<?php namespace Gdoo\Workflow\Controllers;
use DB;
use Auth;
use Request;
use Validator;
use Gdoo\Model\Grid;
use Gdoo\Model\Models\Bill;
use Gdoo\Model\Models\Model;
use Gdoo\Index\Controllers\DefaultController;
use Gdoo\Model\Models\Run;
use Gdoo\Model\Models\RunLog;
use Gdoo\Model\Models\RunStep;
use Gdoo\Model\Models\Step;
use Gdoo\Model\Models\Template;
use Gdoo\Workflow\Models\BillCategory;
class BillController extends DefaultController
{
public function index()
{
$header = [
'master_name' => '流程',
'simple_search_form' => 1,
'table' => 'model_bill',
'master_table' => 'model_bill',
'create_btn' => 1,
];
$search = search_form([
'advanced' => '',
], [
['form_type' => 'text', 'name' => '名称', 'field' => 'model_bill.name', 'value' => '', 'options' => []],
], 'model');
$header['cols'] = [
'checkbox' => [
'width' => 40,
'suppressSizeToFit' => true,
'cellClass' => 'text-center',
'suppressMenu' => true,
'sortable' => false,
'editable' => false,
'resizable' => false,
'filter' => false,
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
'cellClass' => 'text-center',
'suppressMenu' => true,
'sortable' => false,
'resizable' => false,
'editable' => false,
'type' => 'sn',
'filter' => false,
],
'name' => [
'field' => 'name',
'headerName' => '名称',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-left',
'form_type' => 'text',
'width' => 100,
],
'category_name' => [
'field' => 'category_name',
'headerName' => '类别',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-center',
'form_type' => 'text',
'width' => 120,
],
'code' => [
'field' => 'code',
'headerName' => '编码',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-center',
'form_type' => 'text',
'width' => 100,
],
'sn_rule' => [
'field' => 'sn_rule',
'headerName' => '编号规则',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-center',
'form_type' => 'text',
'width' => 80,
],
'updated_dt' => [
'field' => 'updated_dt',
'headerName' => '操作时间',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-center',
'form_type' => 'text',
'width' => 80,
],
'id' => [
'field' => 'id',
'headerName' => 'ID',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-center',
'form_type' => 'text',
'width' => 40,
],
'actions' => [
'headerName' => '',
'cellRenderer' => 'actionCellRenderer',
'options' => [[
'name' => '视图',
'action' => 'view',
'display' => 1,
],[
'name' => '流程',
'action' => 'flow',
'display' => 1,
],[
'name' => '权限',
'action' => 'permission',
'display' => 1,
],[
'name' => '编辑',
'action' => 'edit',
'display' => $this->access['edit'],
]],
'width' => 160,
'cellClass' => 'text-center',
'suppressSizeToFit' => true,
'suppressMenu' => true,
'sortable' => false,
'editable' => false,
'resizable' => false,
'filter' => false,
],
];
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['search_form'] = $search;
$query = $search['query'];
if (Request::method() == 'POST') {
$model = Bill::leftJoin('model_bill_category', 'model_bill_category.id', '=', 'model_bill.category_id')
->selectRaw('
model_bill.*,
model_bill.id as master_id,
model_bill_category.name as category_name
')
->where('model_bill.type', 1)
->orderBy('model_bill.id', 'desc')
->setBy($header);
foreach ($search['where'] as $where) {
if ($where['active']) {
$model->search($where);
}
}
$rows = $model->paginate($query['limit'])->appends($query);
$rows->transform(function($row) {
$row['updated_dt'] = format_datetime($row['updated_at']);
$row['sn_rule'] = $row['sn_prefix'].$row['sn_rule'].($row['sn_length'] > 0 ? $row['sn_length'] : '');
return $row;
});
$ret = $rows->toArray();
$ret['header'] = Grid::getColumns($header);
return $ret;
}
return $this->display([
'header' => $header,
]);
}
public function create()
{
if (Request::method() == 'POST') {
$gets = Request::all();
$rules = [
'name' => 'required',
'code' => 'required|unique:model_bill,code,'.$gets['id'],
];
$v = Validator::make($gets, $rules);
if ($v->fails()) {
return $this->json($v->errors()->first());
}
// 流程设置为1
$gets['audit_type'] = 1;
$gets['type'] = 1;
$bill = Bill::findOrNew($gets['id']);
$bill->fill($gets);
$bill->save();
return $this->json('恭喜你，操作成功。', true);
}
$bill_id = Request::get('id');
$bill = Bill::find($bill_id);
$categorys = BillCategory::get();
return $this->render([
'bill' => $bill,
'categorys' => $categorys,
'bill_id' => $bill_id,
], 'create');
}
public function edit()
{
return $this->create();
}
public function store()
{
return $this->edit();
}
public function delete()
{
$ids = (array)Request::get('id');
if (count($ids) > 0) {
Bill::whereIn('id', $ids)->delete();
Step::whereIn('bill_id', $ids)->delete();
Run::whereIn('bill_id', $ids)->delete();
RunLog::whereIn('bill_id', $ids)->delete();
RunStep::whereIn('bill_id', $ids)->delete();
Template::whereIn('bill_id', $ids)->delete();
return $this->json('恭喜你，操作成功。', true);
}
}
}
app/Gdoo/Workflow/Controllers/CategoryController.php
+207
View File
@@ -0,0 +1,207 @@
<?php namespace Gdoo\Workflow\Controllers;
use Request;
use DB;
use Validator;
use Gdoo\Workflow\Models\BillCategory;
use Gdoo\Model\Grid;
use Gdoo\Index\Controllers\DefaultController;
use Gdoo\Model\Models\Bill;
class CategoryController extends DefaultController
{
public function index()
{
$header = [
'master_name' => '流程类别',
'simple_search_form' => 1,
'table' => 'model_bill_category',
'master_table' => 'model_bill_category',
'create_btn' => 1,
];
$search = search_form([
'advanced' => '',
], [
['form_type' => 'text', 'name' => '名称', 'field' => 'model_bill_category.name', 'value' => '', 'options' => []],
], 'model');
$header['cols'] = [
'checkbox' => [
'width' => 40,
'suppressSizeToFit' => true,
'cellClass' => 'text-center',
'suppressMenu' => true,
'sortable' => false,
'editable' => false,
'resizable' => false,
'filter' => false,
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
'cellClass' => 'text-center',
'suppressMenu' => true,
'sortable' => false,
'resizable' => false,
'editable' => false,
'type' => 'sn',
'filter' => false,
],
'name' => [
'field' => 'name',
'headerName' => '名称',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-left',
'form_type' => 'text',
'width' => 100,
],
'remark' => [
'field' => 'remark',
'headerName' => '备注',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-left',
'form_type' => 'text',
'width' => 0,
],
'sort' => [
'field' => 'sort',
'headerName' => '排序',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-center',
'form_type' => 'text',
'width' => 60,
],
'updated_dt' => [
'field' => 'updated_dt',
'headerName' => '操作时间',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-center',
'form_type' => 'text',
'width' => 60,
],
'id' => [
'field' => 'id',
'headerName' => 'ID',
'sortable' => true,
'suppressMenu' => true,
'cellClass' => 'text-center',
'form_type' => 'text',
'width' => 40,
],
'actions' => [
'headerName' => '',
'cellRenderer' => 'actionCellRenderer',
'options' => [[
'name' => '编辑',
'action' => 'edit',
'display' => $this->access['edit'],
]],
'width' => 80,
'cellClass' => 'text-center',
'suppressSizeToFit' => true,
'suppressMenu' => true,
'sortable' => false,
'editable' => false,
'resizable' => false,
'filter' => false,
],
];
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['search_form'] = $search;
$query = $search['query'];
if (Request::method() == 'POST') {
$model = BillCategory::orderBy('sort', 'desc')
->selectRaw("*, id as master_id")
->setBy($header);
foreach ($search['where'] as $where) {
if ($where['active']) {
$model->search($where);
}
}
$rows = $model->paginate($query['limit'])->appends($query);
$rows->transform(function($row) {
$row['updated_dt'] = format_datetime($row['updated_at']);
return $row;
});
$ret = $rows->toArray();
$ret['header'] = Grid::getColumns($header);
return $ret;
}
return $this->display([
'header' => $header,
]);
}
public function create()
{
if (Request::method() == 'POST') {
$gets = Request::all();
$rules = [
'name' => 'required',
];
$v = Validator::make($gets, $rules);
if ($v->fails()) {
return $this->json($v->errors()->first());
}
$category = BillCategory::findOrNew($gets['id']);
$category->fill($gets);
$category->save();
return $this->json('恭喜你，操作成功。', true);
}
$category_id = Request::get('id');
$category = BillCategory::find($category_id);
return $this->render([
'category' => $category,
], 'create');
}
public function edit()
{
return $this->create();
}
public function store()
{
return $this->edit();
}
public function delete()
{
if (Request::method() == 'POST') {
$id = Request::get('id');
if (empty($id)) {
return $this->json('最少选择一行记录。');
}
$count = Bill::whereIn('category_id', $id)->count();
if ($count > 0) {
return $this->json('此类别存在工作数据，无法删除。');
}
BillCategory::whereIn('id', $id)->delete();
return $this->json('恭喜你，操作成功。', true);
}
}
}
app/Gdoo/Workflow/Controllers/TemplateController.php
+262
View File
@@ -0,0 +1,262 @@
<?php namespace Gdoo\Workflow\Controllers;
use DB;
use Auth;
use Request;
use Validator;
use Gdoo\Model\Models\Model;
use Gdoo\Model\Models\Field;
use Gdoo\Model\Models\Template;
use Gdoo\Index\Controllers\DefaultController;
use Gdoo\Model\Services\ModelService;
class TemplateController extends DefaultController
{
public $permission = ['create', 'create2'];
public function index()
{
if (Request::method() == 'POST') {
$sorts = Request::get('sort');
$i = 0;
foreach ($sorts as $sort) {
Template::where('id', $sort)->update(['sort' => $i]);
$i ++;
}
return $this->json('恭喜你，操作成功。', true);
}
$bill_id = Request::get('bill_id');
$rows = Template::where('bill_id', $bill_id)
->orderBy('sort', 'asc')
->get();
$models = DB::table('model')->where('parent_id', 0)->orderBy('lft', 'asc')->get();
$model = Model::find($bill_id);
return $this->display([
'rows' => $rows,
'bill_id' => $bill_id,
'models' => $models,
'model' => $model,
]);
}
public function create()
{
$gets = Request::all();
if (Request::method() == 'POST') {
$rules = [
'name' => 'required',
];
$v = Validator::make($gets, $rules);
if ($v->fails()) {
return $this->back()->withErrors($v)->withInput();
}
$gets['type'] = join(',', (array)$gets['type']);
$gets['client'] = join(',', (array)$gets['client']);
$gets['tpl'] = json_encode($gets['columns'], JSON_UNESCAPED_UNICODE);
unset($gets['columns']);
$model = Template::findOrNew($gets['id']);
$model->fill($gets);
$model->save();
return $this->json('恭喜你，操作成功。', url('create', ['bill_id' => $gets['bill_id'], 'id' => $gets['id']]));
}
$bill_id = Request::get('bill_id');
$bill = DB::table('model_bill')->find($bill_id);
// 主模型
$master_model = null;
// 获取全部模型
$models = ModelService::getModelAllFields($bill['model_id']);
$lists = [];
foreach ($models as $model) {
if ($model['parent_id'] == 0) {
$master_model = $model;
}
foreach ($model['fields'] as $field) {
$field['table'] = $model['table'];
$lists[$field['id']] = $field;
}
}
$template = DB::table('model_template')->find($gets['id']);
$tpl = $template['tpl'];
$views = json_decode($tpl, true);
foreach ((array)$views as $i => $view) {
$v1 = $view['fields'];
foreach ($v1 as $j => $sublist) {
$_fields = $sublist['fields'];
if ($_fields) {
foreach ($_fields as $k => $_field) {
if (empty($_field['table'])) {
$list = $lists[$_field['id']];
$_field['table'] = $list['table'];
unset($_field['id']);
} else {
$list = $models[$_field['table']]['fields'][$_field['field']];
}
if ($list) {
$_field['name'] = $list['name'];
}
$_fields[$k] = $_field;
unset($models[$_field['table']]['fields'][$_field['field']]);
}
$v1[$j]['fields'] = $_fields;
} else {
if (empty($sublist['table'])) {
$list = $lists[$sublist['id']];
$sublist['table'] = $list['table'];
unset($sublist['id']);
} else {
$sublist['table'] = $master_model['table'];
$list = $models[$master_model['table']]['fields'][$sublist['field']];
}
if ($list) {
$sublist['name'] = $list['name'];
$sublist['field'] = $list['field'];
}
$v1[$j] = $sublist;
unset($models[$sublist['table']]['fields'][$sublist['field']]);
}
}
$views[$i]['fields'] = $v1;
}
$_types = DB::table('model')->orderBy('lft')->get()->keyBy('id');
$types = [];
foreach ($_types as $type) {
if ($type['parent_id']) {
$name = $_types[$type['parent_id']]['name'].'->'.$type['name'];
} else {
$name = $type['name'];
}
$types[] = ['table' => $type['table'], 'name' => $name];
}
$template['tpl'] = json_encode($views, JSON_UNESCAPED_UNICODE);
$template['type'] = explode(',', $template['type']);
$template['client'] = explode(',', $template['client']);
return $this->display([
'template' => $template,
'model' => $model,
'bill_id' => $bill_id,
'models' => $models,
'types' => $types,
]);
}
public function create2()
{
$gets = Request::all();
if (Request::method() == 'POST') {
$rules = [
'name' => 'required',
];
$v = Validator::make($gets, $rules);
if ($v->fails()) {
return $this->back()->withErrors($v)->withInput();
}
$gets['type'] = join(',', (array)$gets['type']);
$gets['client'] = join(',', (array)$gets['client']);
$gets['tpl'] = json_encode($gets['columns'], JSON_UNESCAPED_UNICODE);
unset($gets['columns']);
$model = Template::findOrNew($gets['id']);
$model->fill($gets);
$model->save();
return $this->json('恭喜你，操作成功。', true);
}
$bill_id = Request::get('bill_id');
$bill = DB::table('model_bill')->find($bill_id);
$template = DB::table('model_template')->find($gets['id']);
$leftFields = [];
$rightFields = [];
$views = (array)json_decode($template['tpl'], true);
// 获取所有模型
$models = array_by(ModelService::getModels($bill['model_id']), 'id');
foreach ($views as $view) {
if (empty($view['table'])) {
$view['table'] = $models[$view['model_id']]['table'];
}
unset($view['model_id']);
unset($view['id']);
$rightFields[$view['table'].'.'.$view['field']] = $view;
}
$model = DB::table('model')->find($bill['model_id']);
$_fields = DB::table('model_field')->where('model_id', $model['id'])->orderBy('sort', 'asc')->get();
foreach ($_fields as $field) {
$field_key = $model['table'].'.'.$field['field'];
$rightField = $rightFields[$field_key];
if ($rightField) {
$rightField['name'] = $field['name'];
$rightField['table'] = $model['table'];
$rightField['field'] = $field['field'];
$rightFields[$field_key] = $rightField;
continue;
}
$leftFields[] = ['table' => $model['table'], 'field' => $field['field'], 'name' => $field['name']];
}
// 子模型
$childrens = DB::table('model')->where('parent_id', $model['id'])->get();
foreach ($childrens as $children) {
$_fields = DB::table('model_field')->where('model_id', $children['id'])->orderBy('sort', 'asc')->get();
foreach ($_fields as $field) {
$field_key = $children['table'].'.'.$field['field'];
$rightField = $rightFields[$field_key];
if ($rightField) {
$rightField['table'] = $children['table'];
$rightField['field'] = $field['field'];
$rightField['name'] = '['.$children['name'].']'.$field['name'];
$rightFields[$field_key] = $rightField;
continue;
}
$leftFields[] = ['table' => $children['table'], 'field' => $field['field'], 'name' => '['.$children['name'].']'.$field['name']];
}
}
$rightFields = array_values($rightFields);
$models = DB::table('model')->where('parent_id', 0)->orderBy('lft', 'asc')->get();
$template['leftFields'] = $leftFields;
$template['rightFields'] = $rightFields;
unset($template['tpl']);
$template['type'] = explode(',', $template['type']);
$template['client'] = explode(',', $template['client']);
return $this->display([
'template' => $template,
'model' => $model,
'bill_id' => $bill_id,
'models' => $models,
]);
}
public function delete()
{
$id = Request::get('id');
if ($id > 0) {
DB::table('model_template')->where('id', $id)->delete();
return $this->success('index', '恭喜你，操作成功。');
}
}
}
app/Gdoo/Workflow/Controllers/WidgetController.php
+25
View File
@@ -0,0 +1,25 @@
<?php namespace Gdoo\Workflow\Controllers;
use DB;
use Auth;
use Request;
use Gdoo\Index\Controllers\DefaultController;
use Gdoo\User\Models\User;
class WidgetController extends DefaultController
{
public $permission = ['index'];
public function index()
{
if (Request::method() == 'POST') {
$rows = [];
$json['total'] = sizeof($rows);
$json['data'] = $rows;
return $json;
}
return $this->render();
}
}