From 85a5c6829bf2d988ec61f00a8b120e875bd4ea9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=88=9A?= Date: Thu, 29 Feb 2024 15:40:58 +0800 Subject: [PATCH] * Move updateMetricDate function to master from 18x. --- module/upgrade/config/upgradeflow.php | 2 +- module/upgrade/model.php | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/module/upgrade/config/upgradeflow.php b/module/upgrade/config/upgradeflow.php index dddca70909..bffe450455 100644 --- a/module/upgrade/config/upgradeflow.php +++ b/module/upgrade/config/upgradeflow.php @@ -93,7 +93,7 @@ $config->upgrade->execFlow['18_7'] = array('functions' => 'processHistory $config->upgrade->execFlow['18_8'] = array('functions' => 'upgradeTesttaskMembers,deleteGeneralReportBlock,stopOldCron'); $config->upgrade->execFlow['18_9'] = array('functions' => 'addDefaultTraincoursePriv,renameBIModule,migrateXuanClientSettings'); $config->upgrade->execFlow['18_10_1'] = array('functions' => 'migrateAIModelConfig'); -$config->upgrade->execFlow['20.0.alpha1'] = array('functions' => 'revertStoryCustomFields,hideOA,migrateAIModelConfig'); +$config->upgrade->execFlow['20.0.alpha1'] = array('functions' => 'revertStoryCustomFields,hideOA,updateMetricDateType,migrateAIModelConfig'); if(!empty($config->isINT)) { diff --git a/module/upgrade/model.php b/module/upgrade/model.php index f7024d66a7..473b5cba84 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -8513,6 +8513,21 @@ class upgradeModel extends model if(!dao::isError()) $this->setting->deleteItems('owner=system&module=ai'); } + /** + * Update metric datetype. + * + * @access public + * @return void + */ + public function updateMetricDateType() + { + $this->loadModel('metric'); + foreach($this->config->metric->dateType as $code => $dateType) + { + $this->dao->update(TABLE_METRIC)->set('dateType')->eq($dateType)->where('code')->eq($code)->exec(); + } + } + /** * 检查办公应用是否有数据,没有就隐藏。 * Check if the office app has data, if not, hide it.