test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(用例管理): 用例评审脑图单独评审用例返回结果增加我的结果条件

This commit is contained in:
guoyuqi 2024-08-19 19:01:59 +08:00 committed by Craftsman
parent c2c1e332ee
commit 66a9832e1d
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/case-management/src/main/java/io/metersphere/functional/controller/CaseReviewFunctionalCaseController.java
View File

@ -121,7 +121,7 @@ public class CaseReviewFunctionalCaseController {
@PostMapping("/mind/multiple/review") @PostMapping("/mind/multiple/review")
@Operation(summary = "用例管理-用例评审-评审列表-评审详情-列表-批量评审") @Operation(summary = "评审详情-脑图-多人评审返回评审结果")
@RequiresPermissions(value = {PermissionConstants.CASE_REVIEW_REVIEW, PermissionConstants.CASE_REVIEW_READ_UPDATE}, logical = Logical.OR) @RequiresPermissions(value = {PermissionConstants.CASE_REVIEW_REVIEW, PermissionConstants.CASE_REVIEW_READ_UPDATE}, logical = Logical.OR)
@CheckOwner(resourceId = "#request.getReviewId()", resourceType = "case_review") @CheckOwner(resourceId = "#request.getReviewId()", resourceType = "case_review")
public String mindReview(@Validated @RequestBody MindReviewFunctionalCaseRequest request) { public String mindReview(@Validated @RequestBody MindReviewFunctionalCaseRequest request) {

6
backend/services/case-management/src/main/java/io/metersphere/functional/service/CaseReviewFunctionalCaseService.java
View File

@ -599,7 +599,11 @@ public class CaseReviewFunctionalCaseService {
param.put(CaseEvent.Param.COUNT_MAP, countMap); param.put(CaseEvent.Param.COUNT_MAP, countMap);
provider.updateCaseReview(param); provider.updateCaseReview(param);
return caseReviewFunctionalCase.getStatus(); String status = caseReviewFunctionalCase.getStatus();
if (StringUtils.isNotBlank(request.getUserId())) {
status = request.getStatus();
}
return status;
} }

9
backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewFunctionalCaseControllerTests.java
View File

@ -551,6 +551,15 @@ public class CaseReviewFunctionalCaseControllerTests extends BaseTest {
caseReviewHistories = caseReviewHistoryMapper.selectByExample(caseReviewHistoryExample); caseReviewHistories = caseReviewHistoryMapper.selectByExample(caseReviewHistoryExample);
Assertions.assertEquals(10,caseReviewHistories.size()); Assertions.assertEquals(10,caseReviewHistories.size());
request = new MindReviewFunctionalCaseRequest();
request.setReviewId("wx_review_id_4");
request.setStatus(FunctionalCaseReviewStatus.PASS.toString());
request.setCaseId("wx_case_id_2");
request.setUserId("123");
caseReviewFunctionalCaseService.mindReview(request, "123");
caseReviewHistories = caseReviewHistoryMapper.selectByExample(caseReviewHistoryExample);
Assertions.assertEquals(11,caseReviewHistories.size());
} }
@Test @Test