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:
chenjianxing 2021-06-09 12:58:42 +08:00 committed by jianxing
parent cd2f717806
commit 94d85803ec
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java
View File

@ -21,6 +21,7 @@ public class TestPlanCaseDTO extends TestCaseWithBLOBs {
private String model; private String model;
private String projectName; private String projectName;
private String actualResult; private String actualResult;
private String maintainerName;
private List<TestCaseTestDTO> list; private List<TestCaseTestDTO> list;
} }

2
backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java
View File

@ -26,6 +26,8 @@ public class QueryTestPlanCaseRequest extends TestPlanTestCase {
private String workspaceId; private String workspaceId;
private String projectId;
private String name; private String name;
private String status; private String status;

5
backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
View File

@ -62,11 +62,12 @@ public class TestPlanTestCaseService {
request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders())); request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
List<TestPlanCaseDTO> list = extTestPlanTestCaseMapper.list(request); List<TestPlanCaseDTO> list = extTestPlanTestCaseMapper.list(request);
QueryMemberRequest queryMemberRequest = new QueryMemberRequest(); QueryMemberRequest queryMemberRequest = new QueryMemberRequest();
queryMemberRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId()); queryMemberRequest.setProjectId(request.getProjectId());
Map<String, String> userMap = userService.getMemberList(queryMemberRequest) Map<String, String> userMap = userService.getProjectMemberList(queryMemberRequest)
.stream().collect(Collectors.toMap(User::getId, User::getName)); .stream().collect(Collectors.toMap(User::getId, User::getName));
list.forEach(item -> { list.forEach(item -> {
item.setExecutorName(userMap.get(item.getExecutor())); item.setExecutorName(userMap.get(item.getExecutor()));
item.setMaintainerName(userMap.get(item.getMaintainer()));
}); });
return list; return list;
} }

5
frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
View File

@ -156,11 +156,11 @@
<!-- 责任人(创建该用例时所关联的责任人) --> <!-- 责任人(创建该用例时所关联的责任人) -->
<el-table-column <el-table-column
v-if="item.id == 'maintainer'" v-if="item.id == 'maintainer'"
prop="maintainer" prop="maintainerName"
:filters="maintainerFilters" :filters="maintainerFilters"
min-width="100px" min-width="100px"
:key="index" :key="index"
column-key="maintainer" column-key="maintainerName"
:label="$t('api_test.definition.request.responsible')"> :label="$t('api_test.definition.request.responsible')">
</el-table-column> </el-table-column>
@ -455,6 +455,7 @@ export default {
// param.nodeIds = this.selectNodeIds; // param.nodeIds = this.selectNodeIds;
this.condition.nodeIds = this.selectNodeIds; this.condition.nodeIds = this.selectNodeIds;
} }
this.condition.projectId = getCurrentProjectID();
if (this.planId) { if (this.planId) {
this.result = this.$post(this.buildPagePath('/test/plan/case/list'), this.condition, response => { this.result = this.$post(this.buildPagePath('/test/plan/case/list'), this.condition, response => {
let data = response.data; let data = response.data;