diff --git a/module/my/control.php b/module/my/control.php index 7756332ab3..8dfadbbcd7 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -912,10 +912,11 @@ EOF; } /** + * 评审列表。 * My audits. * * @param string $browseType - * @param string $param + * @param int $param * @param string $orderBy * @param int $recTotal * @param int $recPerPage @@ -923,7 +924,7 @@ EOF; * @access public * @return void */ - public function audit($browseType = 'all', $param = 0, $orderBy = 'time_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1) + public function audit(string $browseType = 'all', int $param = 0, string $orderBy = 'id_desc', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1) { $this->app->loadClass('pager', true); $pager = pager::init($recTotal, $recPerPage, $pageID); @@ -942,11 +943,11 @@ EOF; $reviewList = $this->my->getReviewingList($browseType, $orderBy, $pager); } - $this->view->flows = array(); + $flows = array(); if(in_array($this->config->edition, array('max', 'ipd'))) { $this->app->loadLang('approval'); - $this->view->flows = $this->dao->select('module,name')->from(TABLE_WORKFLOW)->where('buildin')->eq(0)->fetchPairs('module', 'name'); + $flows = $this->my->getFlowPairs(); } $this->view->title = $this->lang->review->common; @@ -960,6 +961,7 @@ EOF; $this->view->pager = $pager; $this->view->param = $param; $this->view->mode = 'audit'; + $this->view->flows = $flows; $this->display(); } diff --git a/module/my/model.php b/module/my/model.php index 77230640a2..141c0b9c80 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -1519,4 +1519,16 @@ class myModel extends model } return $reviewList; } + + /** + * 获取工作流键值对。 + * Get flow paris. + * + * @access public + * @return array + */ + public function getFlowPairs(): array + { + return $this->dao->select('module,name')->from(TABLE_WORKFLOW)->where('buildin')->eq(0)->fetchPairs(); + } } diff --git a/module/my/test/model/getflowpairs.php b/module/my/test/model/getflowpairs.php new file mode 100644 index 0000000000..4785d2b052 --- /dev/null +++ b/module/my/test/model/getflowpairs.php @@ -0,0 +1,22 @@ +#!/usr/bin/env php +config('workflow')->gen(10); +zdTable('user')->gen(1); +su('admin'); + +/** + +title=测试 myModel->getFlowPairs(); +cid=1 +pid=1 + + +*/ + +$my = new myTest(); + +r($my->getFlowPairsTest()) && p() && e('module1:名称1,module2:名称2,module3:名称3,module4:名称4,module6:名称6,module7:名称7,module8:名称8,module9:名称9'); // 测试获取流程键值对 diff --git a/module/my/test/my.class.php b/module/my/test/my.class.php index ed7182cd37..f16bb9d83d 100644 --- a/module/my/test/my.class.php +++ b/module/my/test/my.class.php @@ -1,4 +1,5 @@ objectModel->getFlowPairs(); + + if(dao::isError()) return dao::getError(); + + $return = ''; + foreach($flows as $module => $name) $return .= "{$module}:{$name},"; + + return trim($return, ','); + } } diff --git a/module/my/test/yaml/workflow.yaml b/module/my/test/yaml/workflow.yaml new file mode 100644 index 0000000000..ae4c16d7bf --- /dev/null +++ b/module/my/test/yaml/workflow.yaml @@ -0,0 +1,18 @@ +title: table zt_workflow +author: Mengyi Liu +version: "1.0" +fields: + - field: app + range: 1-10000 + prefix: "app" + - field: module + range: 1-10000 + prefix: "module" + - field: type + range: 1-10000 + prefix: "type" + - field: name + range: 1-10000 + prefix: "名称" + - field: buildin + range: 0{4},1{1} diff --git a/test/data/workflow.yaml b/test/data/workflow.yaml index 959ed30469..086ea14a36 100644 --- a/test/data/workflow.yaml +++ b/test/data/workflow.yaml @@ -4,12 +4,7 @@ author: automated export version: "1.0" fields: - field: id - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" - format: "" + range: 1-100000 - field: parent note: "" prefix: "" @@ -25,12 +20,7 @@ fields: loopfix: "" format: "" - field: type - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" - format: "" + range: flow - field: navigator note: "" prefix: "" @@ -95,12 +85,7 @@ fields: loopfix: "" format: "" - field: buildin - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" - format: "" + range: 0 - field: administrator note: "" prefix: "" @@ -130,12 +115,10 @@ fields: loopfix: "" format: "" - field: createdDate - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" - format: "" + note: "创建日期" + range: "(M)-(w)" + type: timestamp + format: "YY/MM/DD" - field: editedBy note: "" prefix: "" @@ -144,9 +127,7 @@ fields: loopfix: "" format: "" - field: editedDate - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" - format: "" + note: "创建日期" + range: "(M)-(w)" + type: timestamp + format: "YY/MM/DD"