Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [ticket#1282,start,0.5h] add extend fields for feedback.

Browse Source
This commit is contained in:
liumengyi
2024-07-24 15:33:22 +08:00
committed by 田淑杰
parent f10f079d1d
commit ffaf229dc6
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update20.3.0.sql
+4
View File
@@ -1 +1,5 @@
ALTER TABLE `zt_approvalnode` CHANGE `date` `date` datetime NULL;
INSERT INTO `zt_workflowdatasource` (`type`, `name`, `code`, `datasource`, `view`, `keyField`, `valueField`, `buildin`, `vision`) VALUES
('lang', '反馈优先级', 'feedbackPri', 'feedbackPri', '', '', '', 1, 'rnd'),
('lang', '反馈优先级', 'litefeedbackclosedPri', 'feedbackPri', '', '', '', 1, 'lite');
module/upgrade/config/upgradeflow.php
+1 -1
View File
@@ -99,7 +99,7 @@ $config->upgrade->execFlow['20_0_beta2'] = array('functions' => 'updateWorkflow
$config->upgrade->execFlow['20_0'] = array('functions' => 'openCacheByAPCu');
$config->upgrade->execFlow['20_1_0'] = array('functions' => 'completeClassifyLang');
$config->upgrade->execFlow['20_1_1'] = array('functions' => 'syncActivityAndOutput,changeCustomStoryStage,processStoryRelation,processLinkStories,addERName,addTR4APoint');
$config->upgrade->execFlow['20_3_0'] = array('functions' => 'importBuildinWorkflow', 'params' => array('importBuildinWorkflow' => array('or')));
$config->upgrade->execFlow['20_3_0'] = array('functions' => 'importBuildinWorkflow,addFlowFields', 'params' => array('importBuildinWorkflow' => array('or'), 'addFlowFields' => array('biz10.2')));
if(!empty($config->isINT))
{
module/upgrade/model.php
+4 -2
View File
@@ -6032,8 +6032,9 @@ class upgradeModel extends model
{
$this->loadModel('workflowfield');
$upgradeLang = $this->lang->workflowfield->upgrade[$version];
$upgradeConfig = $this->config->workflowfield->upgrade[$version];
$upgradeLang = $this->lang->workflowfield->upgrade[$version];
$upgradeConfig = $this->config->workflowfield->upgrade[$version];
$workFlowDataSource = $this->dao->select('code,id')->from(TABLE_WORKFLOWDATASOURCE)->where('type')->ne('system')->fetchPairs();
$now = helper::now();
foreach($upgradeLang as $module => $fields)
@@ -6052,6 +6053,7 @@ class upgradeModel extends model
$fieldConfig = isset($upgradeConfig[$module][$code]) ? $upgradeConfig[$module][$code] : array();
foreach($fieldConfig as $key => $value) $field->$key = $value;
if($field->control == 'select' && is_string($field->options) && isset($workFlowDataSource[$field->options])) $field->options = $workFlowDataSource[$field->options];
$this->dao->replace(TABLE_WORKFLOWFIELD)->data($field)->autoCheck()->exec();
}