Commit b453d995 authored by 盖献康's avatar 盖献康

Merge branch 'gaixiankang' into 'dev'

根据车型试验子任务ID获取用例集合

See merge request !200
parents 88a0d71a 710df484
...@@ -21,6 +21,9 @@ public class TestUsecaseVO { ...@@ -21,6 +21,9 @@ public class TestUsecaseVO {
@ApiModelProperty("测试用例ID") @ApiModelProperty("测试用例ID")
private Long id; private Long id;
@ApiModelProperty("用例ID")
private String caseId;
@ApiModelProperty("测试场景") @ApiModelProperty("测试场景")
private String testScenario; private String testScenario;
......
...@@ -26,5 +26,5 @@ public interface TestUseCaseService extends IService<TestUseCase> { ...@@ -26,5 +26,5 @@ public interface TestUseCaseService extends IService<TestUseCase> {
* @param request * @param request
* @return * @return
*/ */
List<Long> selectCaseIdList(TestUseCaseIdListRequest request); List<String> selectCaseIdList(TestUseCaseIdListRequest request);
} }
...@@ -41,9 +41,9 @@ public class TestUseCaseServiceImpl extends ServiceImpl<TestUseCaseMapper, TestU ...@@ -41,9 +41,9 @@ public class TestUseCaseServiceImpl extends ServiceImpl<TestUseCaseMapper, TestU
} }
@Override @Override
public List<Long> selectCaseIdList(TestUseCaseIdListRequest request) { public List<String> selectCaseIdList(TestUseCaseIdListRequest request) {
List<TestUsecaseVO> list = testUseCaseMapper.selectListByTaskId(request.getModelTestId()); List<TestUsecaseVO> list = testUseCaseMapper.selectListByTaskId(request.getModelTestId());
return list.stream().map(TestUsecaseVO::getId).collect(Collectors.toList()); return list.stream().map(TestUsecaseVO::getCaseId).collect(Collectors.toList());
} }
} }
......
...@@ -44,7 +44,7 @@ public class TestUserCaseController extends BaseController{ ...@@ -44,7 +44,7 @@ public class TestUserCaseController extends BaseController{
@Anonymous @Anonymous
@ApiOperation("根据场景查询用例ID集合") @ApiOperation("根据场景查询用例ID集合")
@PostMapping("/getCaseIdList") @PostMapping("/getCaseIdList")
public R<List<Long>> getCaseIdList(@Validated @RequestBody TestUseCaseIdListRequest request) { public R<List<String>> getCaseIdList(@Validated @RequestBody TestUseCaseIdListRequest request) {
return R.ok(testUseCaseService.selectCaseIdList(request)); return R.ok(testUseCaseService.selectCaseIdList(request));
} }
} }
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<select id="selectListByTaskId" resultType="com.ruoyi.domain.vo.TestUsecaseVO"> <select id="selectListByTaskId" resultType="com.ruoyi.domain.vo.TestUsecaseVO">
select select
tu.id, tu.id,
tu.case_id caseId,
ts.test_scenario testScenario, ts.test_scenario testScenario,
tt.test_type testType, tt.test_type testType,
tu.usecase_no usecaseNo, tu.usecase_no usecaseNo,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment