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

fix(测试跟踪): 测试计划关联缺陷报告状态统计有误 

--bug=1026644 --user=宋昌昌 【测试跟踪】github#24692，【测试跟踪】-测试计划报告缺陷状态统计不准确 https://www.tapd.cn/55049933/s/1378163
This commit is contained in:
song-cc-rock 2023-06-02 14:51:37 +08:00 committed by fit2-zhao
parent f42c529128
commit 4aede69d1b
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test-track/backend/src/main/java/io/metersphere/service/IssuesService.java
View File

@ -1332,23 +1332,27 @@ public class IssuesService {
public void calculatePlanReport(List<PlanReportIssueDTO> planReportIssueDTOList, TestPlanReportDataStruct report) {
planReportIssueDTOList = DistinctKeyUtil.distinctByKey(planReportIssueDTOList, PlanReportIssueDTO::getId);
// 缺陷状态为自定义字段
List<String> issueIds = planReportIssueDTOList.stream().map(PlanReportIssueDTO::getId).collect(Collectors.toList());
Map<String, String> customStatusMap = customFieldIssuesService.getIssueStatusMap(issueIds, SessionUtils.getCurrentProjectId());
CustomField customField = baseCustomFieldService.getCustomFieldByName(SessionUtils.getCurrentProjectId(), SystemCustomField.ISSUE_STATUS);
JSONArray statusArray = JSONArray.parseArray(customField.getOptions());
TestPlanFunctionResultReportDTO functionResult = report.getFunctionResult();
List<TestCaseReportStatusResultDTO> statusResult = new ArrayList<>();
Map<String, TestCaseReportStatusResultDTO> statusResultMap = new HashMap<>();
planReportIssueDTOList.forEach(item -> {
String status;
// 本地缺陷
if (StringUtils.equalsIgnoreCase(item.getPlatform(), IssuesManagePlatform.Local.name())
|| StringUtils.isBlank(item.getPlatform())) {
status = item.getStatus();
// Local平台, 取自定义状态(如果为空, 则为新增)
status = customStatusMap.getOrDefault(item.getId(), IssuesStatus.NEW.name());
} else {
status = item.getPlatformStatus();
// 第三方平台, 取平台状态(如果为空, 则为新增)
status = Optional.ofNullable(item.getPlatformStatus()).orElse(IssuesStatus.NEW.name());
}
if (StringUtils.isBlank(status)) {
status = IssuesStatus.NEW.toString();
}
TestPlanStatusCalculator.buildStatusResultMap(statusResultMap, status);
TestPlanStatusCalculator.buildStatusResultMap(statusResultMap, parseIssueStatus(status, statusArray));
});
Set<String> status = statusResultMap.keySet();
status.forEach(item -> {
@ -1428,6 +1432,26 @@ public class IssuesService {
}
}
private String parseIssueStatus(String status, JSONArray statusArray) {
status = status.replaceAll("\"", StringUtils.EMPTY);
// 遗留缺陷状态是否存在枚举
IssueStatus statusEnum = IssueStatus.getEnumByName(status);
if (statusEnum != null) {
// 存在缺陷状态枚举类型则获取国际化Key
return Translator.get(statusEnum.getI18nKey());
} else {
// 不存在枚举类型, 则在自定义状态字段option数组中取文本值
for (Object item : statusArray) {
JSONObject statusObj = (JSONObject) item;
if (StringUtils.equals(status, statusObj.get("value").toString())) {
return statusObj.get("text").toString();
}
}
// 如果不在自定义状态字段option数组中, 则直接展示状态
return status;
}
}
public List<IssuesStatusCountDao> getCountByStatus(IssuesCountRequest request) {
request.setCreator(SessionUtils.getUserId());
List<IssuesStatusCountDao> countByStatus = extIssuesMapper.getCountByStatus(request);