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

* [bug#60434,done,0.3h,0h] Fix import jira case status error.

Browse Source
This commit is contained in:
wangyuting
2025-03-11 17:16:32 +08:00
committed by 谢杞钰
parent 70332772db
commit c8d03fdf6c
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/convert/model.php
+15 -6
View File
@@ -961,13 +961,18 @@ EOT;
* Convert stage.
*
* @param string $jiraStatus
* @param string $issueType
* @param array $relations
* @access public
* @return string
*/
public function convertStage(string $jiraStatus, string $issueType): string
public function convertStage(string $jiraStatus, string $issueType, array $relations = array()): string
{
$jiraRelation = $this->session->jiraRelation;
$relations = $jiraRelation ? json_decode($jiraRelation, true) : array();
if(empty($relations))
{
$jiraRelation = $this->session->jiraRelation;
$relations = $jiraRelation ? json_decode($jiraRelation, true) : array();
}
$stage = 'wait';
if(!empty($relations["zentaoStage$issueType"][$jiraStatus])) $stage = $relations["zentaoStage$issueType"][$jiraStatus];
@@ -982,13 +987,17 @@ EOT;
* @param string $objectType
* @param string $jiraStatus
* @param string $issueType
* @param array $relations
* @access public
* @return string
*/
public function convertStatus(string $objectType, string $jiraStatus, string $issueType): string
public function convertStatus(string $objectType, string $jiraStatus, string $issueType, array $relations = array()): string
{
$jiraRelation = $this->session->jiraRelation;
$relations = $jiraRelation ? json_decode($jiraRelation, true) : array();
if(empty($relations))
{
$jiraRelation = $this->session->jiraRelation;
$relations = $jiraRelation ? json_decode($jiraRelation, true) : array();
}
if(!empty($relations["zentaoStatus{$issueType}"][$jiraStatus])) return $relations["zentaoStatus{$issueType}"][$jiraStatus];