diff --git a/test-track/backend/src/main/java/io/metersphere/excel/converter/TestReviewCaseStatus.java b/test-track/backend/src/main/java/io/metersphere/excel/converter/TestReviewCaseStatus.java index f38b8b9d40..7eb01e15e0 100644 --- a/test-track/backend/src/main/java/io/metersphere/excel/converter/TestReviewCaseStatus.java +++ b/test-track/backend/src/main/java/io/metersphere/excel/converter/TestReviewCaseStatus.java @@ -6,7 +6,8 @@ public enum TestReviewCaseStatus { UnPass("execute_not_pass", 2), Underway("test_case_review_status_underway", 3), Again("test_case_status_again", 4), - Prepare("test_case_status_prepare", 5); + Prepare("test_case_status_prepare", 5), + Rereview("test_case_review_status_re_review", 6); private String i18nKey; private Integer order; diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewService.java index d4d6972b23..64e575a2ab 100644 --- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewService.java +++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewService.java @@ -548,11 +548,13 @@ public class TestCaseReviewService { TestCaseReview testCaseReview = new TestCaseReview(); testCaseReview.setId(reviewId); - if (statusList.contains(TestReviewCaseStatus.Prepare.name()) || statusList.contains(TestReviewCaseStatus.Again.name())) { + if (statusList.contains(TestReviewCaseStatus.Prepare.name()) || statusList.contains(TestReviewCaseStatus.Again.name()) || + statusList.contains(TestReviewCaseStatus.Underway.name()) || statusList.contains(TestReviewCaseStatus.Rereview.name())) { testCaseReview.setStatus(TestCaseReviewStatus.Underway.name()); testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview); return; - } else if (statusList.contains(TestReviewCaseStatus.UnPass.name())) { + } + if (statusList.contains(TestReviewCaseStatus.UnPass.name())) { testCaseReview.setStatus(TestCaseReviewStatus.Finished.name()); testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview); return; diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue index 3e1f5aafe6..fb0b4c02e7 100644 --- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue +++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue @@ -5,9 +5,6 @@