From ef552d772b40644939c7e77835a04f8958e3f29e Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@chandao.com>
Date: Tue, 18 Mar 2025 10:29:13 +0800
Subject: [PATCH] * [bug#60484,done,1h,0h] Fix import jira build error.

---
 module/convert/config.php | 6 +++---
 module/convert/tao.php    | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/module/convert/config.php b/module/convert/config.php
index 14be929af0..6aed3e0c76 100644
--- a/module/convert/config.php
+++ b/module/convert/config.php
@@ -156,7 +156,7 @@ $config->convert->importDeafaultValue['bug']['resolution']["Declined"]         =
 $config->convert->importDeafaultValue['bug']['resolution']['完成']             = 'fixed';
 $config->convert->importDeafaultValue['bug']['resolution']["被否决"]           = 'willnotfix';
 $config->convert->importDeafaultValue['bug']['resolution']["重复提交"]         = 'duplicate';
-$config->convert->importDeafaultValue['bug']['resolution']["无法再次重现"]     = 'notrepro';
+$config->convert->importDeafaultValue['bug']['resolution']["无法再次复现"]     = 'notrepro';
 $config->convert->importDeafaultValue['bug']['resolution']["被拒绝"]           = 'willnotfix';
 
 $config->convert->importDeafaultValue['task']['reason']['Done']             = 'done';
@@ -167,7 +167,7 @@ $config->convert->importDeafaultValue['task']['reason']["Declined"]         = 'c
 $config->convert->importDeafaultValue['task']['reason']['完成']             = 'done';
 $config->convert->importDeafaultValue['task']['reason']["被否决"]           = 'cancel';
 $config->convert->importDeafaultValue['task']['reason']["重复提交"]         = 'cancel';
-$config->convert->importDeafaultValue['task']['reason']["无法再次重现"]     = 'cancel';
+$config->convert->importDeafaultValue['task']['reason']["无法再次复现"]     = 'cancel';
 $config->convert->importDeafaultValue['task']['reason']["被拒绝"]           = 'cancel';
 
 $config->convert->importDeafaultValue['story']['reason']['Done']             = 'done';
@@ -178,7 +178,7 @@ $config->convert->importDeafaultValue['story']['reason']["Declined"]         = '
 $config->convert->importDeafaultValue['story']['reason']['完成']             = 'done';
 $config->convert->importDeafaultValue['story']['reason']["被否决"]           = 'willnotdo';
 $config->convert->importDeafaultValue['story']['reason']["重复提交"]         = 'duplicate';
-$config->convert->importDeafaultValue['story']['reason']["无法再次重现"]     = 'bydesign';
+$config->convert->importDeafaultValue['story']['reason']["无法再次复现"]     = 'bydesign';
 $config->convert->importDeafaultValue['story']['reason']["被拒绝"]           = 'cancel';
 
 $config->convert->importDeafaultValue['requirement'] = $config->convert->importDeafaultValue['story'];
diff --git a/module/convert/tao.php b/module/convert/tao.php
index 8d3c54888d..9751a1bf32 100644
--- a/module/convert/tao.php
+++ b/module/convert/tao.php
@@ -171,6 +171,7 @@ class convertTao extends convertModel
         $build->startdate   = isset($data['startdate'])   ? $data['startdate']   : null;
         $build->releasedate = isset($data['releasedate']) ? $data['releasedate'] : '';
         $build->released    = isset($data['released'])    ? $data['released']    : '';
+        $build->archived    = isset($data['archived'])    ? $data['archived']    : false;
         $build->description = isset($data['description']) ? $data['description'] : '';
 
         return $build;
@@ -1907,6 +1908,10 @@ class convertTao extends convertModel
      */
     protected function createRelease(object $build, object $data, array $releaseIssue, array $issueList): bool
     {
+        $status = 'normal';
+        if(empty($data->released))  $status = 'wait';
+        if(!empty($data->archived)) $status = 'terminate';
+
         /* Create release. */
         $release = new stdclass();
         $release->product      = $build->product;
@@ -1916,7 +1921,7 @@ class convertTao extends convertModel
         $release->name         = $build->name;
         $release->date         = helper::isZeroDate($data->startdate) ? NULL : substr($data->startdate, 0, 10);
         $release->desc         = isset($data->description) ? $data->description : '';
-        $release->status       = empty($data->released) ? 'wait' : 'normal';
+        $release->status       = $status;
         $release->releasedDate = !empty($data->released) ? substr($data->releasedate, 0, 10) : null;
         $release->createdBy    = $this->app->user->account;
         $release->createdDate  = helper::now();