From ed98c8e8486ed3ceed592c4f875e65dd4351c7c1 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 20 Aug 2020 10:50:14 +0800 Subject: [PATCH] * Code for risk. --- db/update20.0.sql | 2 +- module/risk/config.php | 8 +++---- module/risk/control.php | 4 ++-- module/risk/lang/zh-cn.php | 8 +++++++ module/risk/model.php | 40 ++++++++++++++++++++++++++++++-- module/risk/view/browse.html.php | 19 +++++++++++---- 6 files changed, 68 insertions(+), 13 deletions(-) diff --git a/db/update20.0.sql b/db/update20.0.sql index 7f8d18150f..6024f6404c 100644 --- a/db/update20.0.sql +++ b/db/update20.0.sql @@ -161,7 +161,7 @@ CREATE TABLE `zt_risk` ( `cancelDate` date NOT NULL, `cancelReason` char(30) NOT NULL, `hangupBy` varchar(30) NOT NULL, - `hangupdDate` date NOT NULL, + `hangupDate` date NOT NULL, `trackedBy` varchar(30) NOT NULL, `trackedDate` date NOT NULL, `assignedDate` date NOT NULL, diff --git a/module/risk/config.php b/module/risk/config.php index ea0bf70def..b688aa7ecb 100644 --- a/module/risk/config.php +++ b/module/risk/config.php @@ -12,11 +12,11 @@ $config->risk->create = new stdclass(); $config->risk->create->requiredFields = 'name'; global $lang; -$config->risk->search['module'] = 'bug'; +$config->risk->search['module'] = 'risk'; $config->risk->search['fields']['id'] = $lang->risk->id; $config->risk->search['fields']['name'] = $lang->risk->name; $config->risk->search['fields']['source'] = $lang->risk->source; -$config->risk->search['fields']['categroy'] = $lang->risk->category; +$config->risk->search['fields']['category'] = $lang->risk->category; $config->risk->search['fields']['strategy'] = $lang->risk->strategy; $config->risk->search['fields']['status'] = $lang->risk->status; $config->risk->search['fields']['impact'] = $lang->risk->impact; @@ -36,13 +36,13 @@ $config->risk->search['fields']['activateBy'] = $lang->risk->activateBy; $config->risk->search['fields']['assignedTo'] = $lang->risk->assignedTo; $config->risk->search['fields']['cancelBy'] = $lang->risk->cancelBy; $config->risk->search['fields']['hangupBy'] = $lang->risk->hangupBy; -$config->risk->search['fields']['trackedBy'] = $lang->risk->trackedDate; +$config->risk->search['fields']['trackedBy'] = $lang->risk->trackedBy; $config->risk->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->risk->search['params']['source'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->risk->sourceList); $config->risk->search['params']['category'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->risk->categoryList); $config->risk->search['params']['strategy'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->risk->strategyList); -$config->risk->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->risk->status); +$config->risk->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->risk->statusList); $config->risk->search['params']['impact'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->risk->impactList); $config->risk->search['params']['probability'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->risk->probabilityList); $config->risk->search['params']['riskindex'] = array('operator' => '=', 'control' => 'input', 'values' => ''); diff --git a/module/risk/control.php b/module/risk/control.php index 91696bcfd3..265fddeff2 100644 --- a/module/risk/control.php +++ b/module/risk/control.php @@ -1,7 +1,7 @@ view->title = $this->lang->risk->common . $this->lang->colon . $this->lang->risk->browse; $this->view->position[] = $this->lang->risk->browse; - $this->view->risks = $this->risk->getList($orderBy, $pager); + $this->view->risks = $this->risk->getList($browseType, $param, $orderBy, $pager); $this->view->browseType = $browseType; $this->view->param = $param; $this->view->orderBy = $orderBy; diff --git a/module/risk/lang/zh-cn.php b/module/risk/lang/zh-cn.php index b99c51f6d2..5f4019239e 100644 --- a/module/risk/lang/zh-cn.php +++ b/module/risk/lang/zh-cn.php @@ -11,6 +11,7 @@ $lang->risk->cancel = '取消'; $lang->risk->track = '跟踪'; $lang->risk->assignTo = '指派'; $lang->risk->deleted = '删除'; +$lang->risk->byQuery = '搜索'; $lang->risk->legendBasicInfo = '基本信息'; $lang->risk->legendLifeTime = '风险的一生'; @@ -109,3 +110,10 @@ $lang->risk->isChangeList[1] = '是'; $lang->risk->cancelReasonList[''] = ''; $lang->risk->cancelReasonList['disappeared'] = '风险自行消失'; $lang->risk->cancelReasonList['mistake'] = '识别错误'; + +$lang->risk->featureBar['browse']['all'] = '所有'; +$lang->risk->featureBar['browse']['active'] = '开放'; +$lang->risk->featureBar['browse']['assignTo'] = '指派给我'; +$lang->risk->featureBar['browse']['closed'] = '已关闭'; +$lang->risk->featureBar['browse']['hangup'] = '已挂起'; +$lang->risk->featureBar['browse']['canceled'] = '已取消'; diff --git a/module/risk/model.php b/module/risk/model.php index 8d424cc032..17761f81be 100644 --- a/module/risk/model.php +++ b/module/risk/model.php @@ -78,10 +78,46 @@ class riskModel extends model return false; } - public function getList($orderBy = 'id_desc', $pager = null) + public function getList($browseType = '', $param = '', $orderBy = 'id_desc', $pager = null) { + if($browseType == 'bySearch') return $this->getBySearch($param, $orderBy, $pager); + return $this->dao->select('*')->from(TABLE_RISK) ->where('deleted')->eq(0) + ->beginIF($browseType != 'all' and $browseType != 'assignTo')->andWhere('status')->eq($browseType)->fi() + ->beginIF($browseType == 'assignTo')->andWhere('assignedTo')->eq($this->app->user->account)->fi() + ->andWhere('program')->eq($this->session->program) + ->orderBy($orderBy) + ->page($pager) + ->fetchAll('id'); + } + + public function getBySearch($queryID = '', $orderBy = 'id_desc', $pager = null) + { + if($queryID) + { + $query = $this->loadModel('search')->getQuery($queryID); + if($query) + { + $this->session->set('riskQuery', $query->sql); + $this->session->set('riskForm', $query->form); + } + else + { + $this->session->set('riskQuery', ' 1 = 1'); + } + } + else + { + if($this->session->riskQuery == false) $this->session->set('riskQuery', ' 1 = 1'); + } + a($this->session->riskQuery);die; + + $riskQuery = $this->session->riskQuery; + + return $this->dao->select('*')->from(TABLE_RISK) + ->where($riskQuery) + ->andWhere('deleted')->eq('0') ->andWhere('program')->eq($this->session->program) ->orderBy($orderBy) ->page($pager) @@ -231,6 +267,6 @@ class riskModel extends model $this->config->risk->search['actionURL'] = $actionURL; $this->config->risk->search['queryID'] = $queryID; - $this->loadModel('search')->setSearchParams($this->config->bug->search); + $this->loadModel('search')->setSearchParams($this->config->risk->search); } } diff --git a/module/risk/view/browse.html.php b/module/risk/view/browse.html.php index 07dddccce6..d00552f263 100644 --- a/module/risk/view/browse.html.php +++ b/module/risk/view/browse.html.php @@ -1,16 +1,27 @@ + +
- +

noData;?> @@ -21,7 +32,7 @@

- recTotal}&recPerPage={$pager->recPerPage}";?> + recTotal}&recPerPage={$pager->recPerPage}";?>
risk->id);?>