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:
song-cc-rock 2022-11-23 11:47:11 +08:00 committed by 刘瑞斌
parent a04209b7f0
commit fe71d183a0
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test-track/backend/src/main/java/io/metersphere/constants/SystemCustomField.java
View File

@ -7,4 +7,5 @@ package io.metersphere.constants;
public class SystemCustomField { public class SystemCustomField {
public static final String ISSUE_STATUS = "状态"; public static final String ISSUE_STATUS = "状态";
public static final String ISSUE_DEGREE = "严重程度"; public static final String ISSUE_DEGREE = "严重程度";
public static final String CASE_PRIORITY = "用例等级";
} }

25
test-track/backend/src/main/java/io/metersphere/service/TrackService.java
View File

@ -8,7 +8,9 @@ import io.metersphere.base.domain.TestPlanExample;
import io.metersphere.base.mapper.TestPlanMapper; import io.metersphere.base.mapper.TestPlanMapper;
import io.metersphere.base.mapper.ext.ExtIssuesMapper; import io.metersphere.base.mapper.ext.ExtIssuesMapper;
import io.metersphere.base.mapper.ext.ExtTestCaseMapper; import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
import io.metersphere.commons.constants.CustomFieldScene;
import io.metersphere.commons.utils.DateUtils; import io.metersphere.commons.utils.DateUtils;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.constants.IssueStatus; import io.metersphere.constants.IssueStatus;
import io.metersphere.constants.SystemCustomField; import io.metersphere.constants.SystemCustomField;
import io.metersphere.dto.BugStatistics; import io.metersphere.dto.BugStatistics;
@ -18,6 +20,7 @@ import io.metersphere.dto.TrackCountResult;
import io.metersphere.i18n.Translator; import io.metersphere.i18n.Translator;
import io.metersphere.plan.dto.ChartsData; import io.metersphere.plan.dto.ChartsData;
import io.metersphere.plan.service.TestPlanService; import io.metersphere.plan.service.TestPlanService;
import io.metersphere.request.testcase.TrackCount;
import io.metersphere.xpack.track.dto.IssuesDao; import io.metersphere.xpack.track.dto.IssuesDao;
import io.metersphere.xpack.track.dto.request.IssuesRequest; import io.metersphere.xpack.track.dto.request.IssuesRequest;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
@ -51,7 +54,27 @@ public class TrackService {
private ExtIssuesMapper extIssuesMapper; private ExtIssuesMapper extIssuesMapper;
public List<TrackCountResult> countPriority(String projectId) { public List<TrackCountResult> countPriority(String projectId) {
return extTestCaseMapper.countPriority(projectId); List<TrackCountResult> trackCountResults = extTestCaseMapper.countPriority(projectId);
trackCountResults.forEach(trackCountResult -> {
String groupField = trackCountResult.getGroupField();
if (StringUtils.isNotEmpty(groupField) && !StringUtils.equalsAnyIgnoreCase(groupField,
TrackCount.P0, TrackCount.P1, TrackCount.P2, TrackCount.P3)) {
// 系统字段自定义选项值
CustomField priorityField = baseCustomFieldService.getCustomFieldByName(SessionUtils.getCurrentProjectId(), SystemCustomField.CASE_PRIORITY);
if (priorityField != null && StringUtils.equals(priorityField.getScene(), CustomFieldScene.TEST_CASE.name())) {
String options = priorityField.getOptions();
List<Map> optionMapList = JSONArray.parseArray(options, Map.class);
optionMapList.forEach(optionMap -> {
String text = optionMap.get("text").toString();
String value = optionMap.get("value").toString();
if (StringUtils.equals(groupField, value)) {
trackCountResult.setGroupField(text);
}
});
}
}
});
return trackCountResults;
} }
public long countCreatedThisWeek(String projectId) { public long countCreatedThisWeek(String projectId) {