* Move updateMetricDate function to master from 18x.

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))
 {

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.