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

revert(测试跟踪): 首页遗留缺陷统计总数和占比有统计错误 

This reverts commit 23afe75805.
This commit is contained in:
shiziyuan9527 2022-11-09 14:19:24 +08:00 committed by lyh
parent 2a661ac7b3
commit ccbb0da54c
1 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
framework/sdk-parent/sdk/src/main/java/io/metersphere/service/BaseCustomFieldService.java
View File

@ -1,9 +1,8 @@
package io.metersphere.service; package io.metersphere.service;
import io.metersphere.base.domain.*; import io.metersphere.base.domain.CustomField;
import io.metersphere.base.domain.CustomFieldExample;
import io.metersphere.base.mapper.CustomFieldMapper; import io.metersphere.base.mapper.CustomFieldMapper;
import io.metersphere.base.mapper.CustomFieldTemplateMapper;
import io.metersphere.base.mapper.ProjectMapper;
import io.metersphere.base.mapper.ext.BaseCustomFieldMapper; import io.metersphere.base.mapper.ext.BaseCustomFieldMapper;
import io.metersphere.commons.constants.CustomFieldType; import io.metersphere.commons.constants.CustomFieldType;
import io.metersphere.commons.utils.JSON; import io.metersphere.commons.utils.JSON;
@ -30,11 +29,6 @@ public class BaseCustomFieldService {
@Resource @Resource
CustomFieldMapper customFieldMapper; CustomFieldMapper customFieldMapper;
@Resource
private ProjectMapper projectMapper;
@Resource
private CustomFieldTemplateMapper customFieldTemplateMapper;
public CustomField get(String id) { public CustomField get(String id) {
return customFieldMapper.selectByPrimaryKey(id); return customFieldMapper.selectByPrimaryKey(id);
} }
@ -108,41 +102,13 @@ public class BaseCustomFieldService {
} }
public CustomField getCustomFieldByName(String projectId, String fieldName) { public CustomField getCustomFieldByName(String projectId, String fieldName) {
Project project = projectMapper.selectByPrimaryKey(projectId);
if (project == null) {
return null;
}
String issueTemplateId = project.getIssueTemplateId();
if (StringUtils.isBlank(issueTemplateId)) {
return null;
}
CustomFieldTemplateExample customFieldTemplateExample = new CustomFieldTemplateExample();
customFieldTemplateExample.createCriteria().andTemplateIdEqualTo(issueTemplateId);
List<CustomFieldTemplate> customFieldTemplates = customFieldTemplateMapper.selectByExample(customFieldTemplateExample);
if (CollectionUtils.isEmpty(customFieldTemplates)) {
return null;
}
List<String> templateFieldIds = customFieldTemplates
.stream()
.map(CustomFieldTemplate::getFieldId)
.collect(Collectors.toList());
CustomFieldExample example = new CustomFieldExample(); CustomFieldExample example = new CustomFieldExample();
example.createCriteria() example.createCriteria()
.andProjectIdEqualTo(projectId) .andProjectIdEqualTo(projectId)
.andNameEqualTo(fieldName); .andNameEqualTo(fieldName);
List<CustomField> customFields = customFieldMapper.selectByExample(example); List<CustomField> customFields = customFieldMapper.selectByExample(example);
if (CollectionUtils.isNotEmpty(customFields)) { if (CollectionUtils.isNotEmpty(customFields)) {
for (CustomField customField : customFields) { return customFields.get(0);
if (templateFieldIds.contains(customField.getId())) {
return customField;
}
}
return null;
} else { } else {
example.clear(); example.clear();
example.createCriteria() example.createCriteria()