From 2bffa2706def26f3e269dab1d39913f01da197bc Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Wed, 15 Mar 2023 10:26:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F=E5=A4=8D=E5=88=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=94=A8=E4=BE=8B=E5=A4=8D=E5=88=B6=E4=BA=86=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E7=BB=93=E6=9E=9C=E5=92=8C=E8=AF=84=E5=AE=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1024445 --user=王孝刚 【测试跟踪】批量复制用例，复制了创建人、评审状态和执行结果 https://www.tapd.cn/55049933/s/1350276 --- .../metersphere/service/TestCaseService.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java index 52da36b956..d389083ec1 100644 --- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java +++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java @@ -35,24 +35,27 @@ import io.metersphere.plan.service.TestPlanTestCaseService; import io.metersphere.request.OrderRequest; import io.metersphere.request.ProjectVersionRequest; import io.metersphere.request.ResetOrderRequest; -import io.metersphere.service.remote.ui.RelevanceUiCaseService; -import io.metersphere.xpack.track.dto.AttachmentRequest; import io.metersphere.request.member.QueryMemberRequest; import io.metersphere.request.testcase.*; import io.metersphere.service.issue.platform.IssueFactory; import io.metersphere.service.remote.api.RelevanceApiCaseService; import io.metersphere.service.remote.performance.RelevanceLoadCaseService; import io.metersphere.service.remote.project.TrackTestCaseTemplateService; +import io.metersphere.service.remote.ui.RelevanceUiCaseService; import io.metersphere.service.wapper.TrackProjectService; import io.metersphere.utils.DiscoveryUtil; import io.metersphere.xmind.XmindCaseParser; import io.metersphere.xmind.pojo.TestCaseXmindData; import io.metersphere.xmind.utils.XmindExportUtil; +import io.metersphere.xpack.track.dto.AttachmentRequest; import io.metersphere.xpack.track.dto.EditTestCaseRequest; import io.metersphere.xpack.track.dto.IssuesDao; import io.metersphere.xpack.track.dto.request.IssuesRequest; import io.metersphere.xpack.track.issue.IssuesPlatform; import io.metersphere.xpack.version.service.ProjectVersionService; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.collections4.ListUtils; @@ -68,9 +71,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.File; import java.io.IOException; @@ -80,7 +80,6 @@ import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import java.util.stream.Stream; @Service @Transactional(rollbackFor = Exception.class) @@ -233,6 +232,7 @@ public class TestCaseService { request.setDemandId(request.getDemandId()); request.setDemandName(request.getDemandName()); request.setCreateUser(SessionUtils.getUserId()); + request.setLastExecuteResult(null); this.setNode(request); request.setOrder(ServiceUtils.getNextOrder(request.getProjectId(), extTestCaseMapper::getLastOrder)); //直接点保存 || 复制走的逻辑 @@ -444,9 +444,9 @@ public class TestCaseService { Boolean reReview = config.getReReview(); if (BooleanUtils.isTrue(reReview) && originCase != null) { if (!StringUtils.equals(originCase.getPrerequisite(), testCase.getPrerequisite()) // 前置条件添加发生变化 - || !StringUtils.equals(originCase.getSteps(), testCase.getSteps()) // 步骤发生变化 - || !StringUtils.equals(originCase.getStepDescription(), testCase.getStepDescription()) - || !StringUtils.equals(originCase.getExpectedResult(), testCase.getExpectedResult())) { + || !StringUtils.equals(originCase.getSteps(), testCase.getSteps()) // 步骤发生变化 + || !StringUtils.equals(originCase.getStepDescription(), testCase.getStepDescription()) + || !StringUtils.equals(originCase.getExpectedResult(), testCase.getExpectedResult())) { testReviewTestCaseService.reReviewByCaseId(testCase.getId()); } } @@ -3024,6 +3024,11 @@ public class TestCaseService { testCase.setCustomNum(String.valueOf(nextNum)); testCase.setNum(nextNum++); testCase.setCasePublic(false); + testCase.setCreateUser(SessionUtils.getUserId()); + testCase.setMaintainer(SessionUtils.getUserId()); + testCase.setReviewStatus(TestCaseReviewStatus.Prepare.name()); + testCase.setStatus(TestCaseReviewStatus.Prepare.name()); + testCase.setLastExecuteResult(null); testCase.setCreateTime(System.currentTimeMillis()); testCase.setUpdateTime(System.currentTimeMillis()); testCase.setRefId(id);