From ffaf229dc65e8c8c633fce1aa10ffc83233270f6 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 24 Jul 2024 15:21:33 +0800
Subject: [PATCH] * [ticket#1282,start,0.5h] add extend fields for feedback.

---
 db/update20.3.0.sql                   | 4 ++++
 module/upgrade/config/upgradeflow.php | 2 +-
 module/upgrade/model.php              | 6 ++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/db/update20.3.0.sql b/db/update20.3.0.sql
index fdb17b4d65..baee913a4e 100644
--- a/db/update20.3.0.sql
+++ b/db/update20.3.0.sql
@@ -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');
diff --git a/module/upgrade/config/upgradeflow.php b/module/upgrade/config/upgradeflow.php
index d8fd667656..997c81eaa1 100644
--- a/module/upgrade/config/upgradeflow.php
+++ b/module/upgrade/config/upgradeflow.php
@@ -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))
 {
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 4bae02f956..274f21c966 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -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();
             }