From 4e5c1d1ce33d46f252a74a8eb081313acbb0ec5d Mon Sep 17 00:00:00 2001
From: MeterSphere Bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:57:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=AF=BC=E5=85=A5=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: song-cc-rock <changchang.song@fit2cloud.com>
---
 .../constants/TestCaseStatusConstants.java    | 14 +++++++++++++
 .../listener/TestCaseNoModelDataListener.java | 21 ++++++++++++++++++-
 .../track/service/TestCaseService.java        |  4 +++-
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/commons/constants/TestCaseStatusConstants.java

diff --git a/backend/src/main/java/io/metersphere/commons/constants/TestCaseStatusConstants.java b/backend/src/main/java/io/metersphere/commons/constants/TestCaseStatusConstants.java
new file mode 100644
index 0000000000..7489b852a2
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/constants/TestCaseStatusConstants.java
@@ -0,0 +1,14 @@
+package io.metersphere.commons.constants;
+
+public class TestCaseStatusConstants {
+
+    public static final String UNDERWAY_US = "Underway";
+    public static final String UNDERWAY_CN = "进行中";
+    public static final String UNDERWAY_TW = "進行中";
+    public static final String PREPARE_US = "Prepare";
+    public static final String PREPARE_CN = "未开始";
+    public static final String PREPARE_TW = "未開始";
+    public static final String COMPLETED_US = "Completed";
+    public static final String COMPLETED_CN = "已完成";
+    public static final String COMPLETED_TW = "已完成";
+}
diff --git a/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java b/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
index 4a8ecc2c47..2f56551ed2 100644
--- a/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
+++ b/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
@@ -7,7 +7,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.base.domain.TestCase;
 import io.metersphere.base.domain.TestCaseWithBLOBs;
+import io.metersphere.commons.constants.CommonConstants;
 import io.metersphere.commons.constants.TestCaseConstants;
+import io.metersphere.commons.constants.TestCaseStatusConstants;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
 import io.metersphere.dto.CustomFieldDao;
@@ -642,7 +644,7 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
             } else if (StringUtils.equals(field, "stepModel")) {
                 data.setStepModel(value);
             } else if (StringUtils.equals(field, "status")) {
-                data.setStatus(value);
+                data.setStatus(parseStatus(value));
             } else if (StringUtils.equals(field, "maintainer")) {
                 data.setMaintainer(value);
             } else if (StringUtils.equals(field, "priority")) {
@@ -771,4 +773,21 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
         }
         return true;
     }
+
+    public String parseStatus(String parseStatus){
+        String caseStatusValue = "";
+        if(StringUtils.equalsAnyIgnoreCase(parseStatus,
+                TestCaseStatusConstants.UNDERWAY_US, TestCaseStatusConstants.UNDERWAY_CN, TestCaseStatusConstants.UNDERWAY_TW)){
+            caseStatusValue = TestCaseStatusConstants.UNDERWAY_US;
+        }else if(StringUtils.equalsAnyIgnoreCase(parseStatus,
+                TestCaseStatusConstants.PREPARE_US, TestCaseStatusConstants.PREPARE_CN, TestCaseStatusConstants.PREPARE_TW)){
+            caseStatusValue = TestCaseStatusConstants.PREPARE_US;
+        }else if(StringUtils.equalsAnyIgnoreCase(parseStatus,
+                TestCaseStatusConstants.COMPLETED_US, TestCaseStatusConstants.COMPLETED_CN, TestCaseStatusConstants.COMPLETED_TW)){
+            caseStatusValue = TestCaseStatusConstants.COMPLETED_US;
+        }else if(StringUtils.equalsAnyIgnoreCase(parseStatus, CommonConstants.TrashStatus)){
+            caseStatusValue = CommonConstants.TrashStatus;
+        }
+        return caseStatusValue;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index e8d60ae405..f1e467c017 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -1084,7 +1084,9 @@ public class TestCaseService {
                     }
                     num++;
                     testCase.setReviewStatus(TestCaseReviewStatus.Prepare.name());
-                    testCase.setStatus(TestCaseReviewStatus.Prepare.name());
+                    if (StringUtils.isEmpty(testCase.getStatus())) {
+                        testCase.setStatus(TestCaseReviewStatus.Prepare.name());
+                    }
                     testCase.setOrder(Long.valueOf(testCases.size() - (num - beforeInsertId)) * ServiceUtils.ORDER_STEP);
                     testCase.setRefId(testCase.getId());
                     testCase.setVersionId(request.getVersionId());