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

* [bug#65418,done,0.5h,0h] Fix upgrade reviewcl category error.

Browse Source
This commit is contained in:
wangyuting
2025-09-12 09:34:34 +08:00
parent ca836ee4d9
commit af690e4276
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/config/upgradeflow.php
+1 -1
View File
@@ -112,7 +112,7 @@ $config->upgrade->execFlow['21_6_beta'] = array('functions' => 'processCharter
$config->upgrade->execFlow['21_6_1'] = array('xxsqls' => "$appRoot/db/upgradexuanxuan9.1.2.sql");
$config->upgrade->execFlow['21_7'] = array('functions' => 'fixWorkflowNameForExecution');
$config->upgrade->execFlow['21_7_1'] = array('functions' => 'convertCharset,processActionProduct');
$config->upgrade->execFlow['21_7_3'] = array('functions' => 'upgradeProcessAndActivity,addDefaultDeliverableModule,upgradeDesignToDeliverable,buildinTestcaseStageDeliverable,upgradeDeliverable,buildinBaselineReview,upgradeBaselineObjects,upgradeReviewToDeliverable');
$config->upgrade->execFlow['21_7_3'] = array('functions' => 'upgradeProcessAndActivity,addDefaultDeliverableModule,upgradeDesignToDeliverable,buildinTestcaseStageDeliverable,upgradeDeliverable,buildinBaselineReview,upgradeReviewclCategory,upgradeBaselineObjects,upgradeReviewToDeliverable');
if(!empty($config->isINT))
{
module/upgrade/model.php
+48 -2
View File
@@ -11841,9 +11841,9 @@ class upgradeModel extends model
* Buildin baseline review flow.
*
* @access public
* @return void
* @return bool
*/
public function buildinBaselineReview()
public function buildinBaselineReview(): bool
{
$reviewFlow = new stdclass();
$reviewFlow->flow = '1';
@@ -11862,6 +11862,52 @@ class upgradeModel extends model
$this->dao->insert(TABLE_APPROVALFLOWOBJECT)->data($reviewFlow)->exec();
}
}
return true;
}
/**
* 升级检查单分类到项目流程下。
* Upgrade reviewcl category.
*
* @access public
* @return bool
*/
public function upgradeReviewclCategory(): bool
{
$this->loadModel('custom');
$clientLang = $this->app->getClientLang();
$categoryList = $this->dao->select('`key`, value')->from(TABLE_LANG)
->where('module')->eq('reviewcl')
->andWhere('section')->eq('waterfallCategoryList')
->andWhere('lang')->in(array($clientLang, 'all'))
->orderBy('id_asc')
->fetchPairs();
$categoryPlusList = $this->dao->select('`key`, value')->from(TABLE_LANG)
->where('module')->eq('reviewcl')
->andWhere('section')->eq('waterfallplusCategoryList')
->andWhere('lang')->in(array($clientLang, 'all'))
->orderBy('id_asc')
->fetchPairs();
if(empty($categoryList) && empty($categoryPlusList)) return true;
$workflows = $this->dao->select('id,projectModel')->from(TABLE_WORKFLOWGROUP)->where('projectModel')->in('waterfall,waterfallplus')->fetchAll('id');
foreach($workflows as $workflow)
{
if($workflow->projectModel == 'waterfall' && !empty($categoryList))
{
foreach($categoryList as $key => $value) $this->custom->setItem("{$clientLang}.reviewcl.{$workflow->id}CategoryList.{$key}.1", $value);
}
if($workflow->projectModel == 'waterfallplus' && !empty($categoryPlusList))
{
foreach($categoryPlusList as $key => $value) $this->custom->setItem("{$clientLang}.reviewcl.{$workflow->id}CategoryList.{$key}.1", $value);
}
}
$this->dao->delete()->from(TABLE_LANG)->where('section')->in('waterfallCategoryList,waterfallplusCategoryList')->exec();
return true;
}
/**