fix: 解决bug

1.接口用例筛选失效
2.饼图显示数据
3.接口用例在接口定义后面
4.点击全部项目暂时让他不生效
5.接口用例点击更新和完成数据有问题
6.计划没有用例的显示
7.接口定义创建人是userId
8.饼图加线
9.性能用例去掉项目ID的过滤
This commit is contained in:
guoyuqi 2021-10-27 19:56:19 +08:00 committed by 刘瑞斌
parent 0552394d73
commit 52391e7dd4
5 changed files with 8 additions and 10 deletions

View File

@ -127,8 +127,10 @@ public abstract class ApiImportAbstractParser<T> implements ApiImportParser<T> {
apiDefinition.setProjectId(this.projectId); apiDefinition.setProjectId(this.projectId);
if (StringUtils.equalsIgnoreCase("schedule", importRequest.getType())) { if (StringUtils.equalsIgnoreCase("schedule", importRequest.getType())) {
apiDefinition.setUserId(importRequest.getUserId()); apiDefinition.setUserId(importRequest.getUserId());
apiDefinition.setCreateUser(importRequest.getUserId());
} else { } else {
apiDefinition.setUserId(SessionUtils.getUserId()); apiDefinition.setUserId(SessionUtils.getUserId());
apiDefinition.setCreateUser(SessionUtils.getUserId());
} }
return apiDefinition; return apiDefinition;
} }

View File

@ -238,10 +238,6 @@ public class ApiDefinitionService {
} }
} }
} }
//update userId
if(StringUtils.equalsIgnoreCase(request.getUserId(),"currentUserId")){
request.setUserId(SessionUtils.getUserId());
}
return request; return request;
} }

View File

@ -120,8 +120,8 @@
LEFT JOIN schedule ON schedule.resource_id = test_plan.id LEFT JOIN schedule ON schedule.resource_id = test_plan.id
JOIN project on project.id = test_plan.project_id JOIN project on project.id = test_plan.project_id
<if test="request.executorOrPrincipal != null"> <if test="request.executorOrPrincipal != null">
JOIN test_plan_principal ON test_plan_principal.test_plan_id = test_plan.id LEFT JOIN test_plan_principal ON test_plan_principal.test_plan_id = test_plan.id
JOIN test_plan_test_case on test_plan_test_case.plan_id = test_plan.id LEFT JOIN test_plan_test_case on test_plan_test_case.plan_id = test_plan.id
</if> </if>
<where> <where>
<if test="request.combine != null"> <if test="request.combine != null">

View File

@ -153,10 +153,10 @@ public class TestCaseReviewService {
public List<TestCaseReviewDTO> listCaseReview(QueryCaseReviewRequest request) { public List<TestCaseReviewDTO> listCaseReview(QueryCaseReviewRequest request) {
request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders())); request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
String projectId = request.getProjectId(); /*String projectId = request.getProjectId();
if (StringUtils.isBlank(projectId)) { if (StringUtils.isBlank(projectId)) {
return new ArrayList<>(); return new ArrayList<>();
} }*/
//update reviewerId //update reviewerId
if(StringUtils.equalsIgnoreCase(request.getReviewerId(),"currentUserId")){ if(StringUtils.equalsIgnoreCase(request.getReviewerId(),"currentUserId")){
request.setReviewerId(SessionUtils.getUserId()); request.setReviewerId(SessionUtils.getUserId());

View File

@ -38,8 +38,8 @@ export default {
}, },
label: { label: {
show: true, show: true,
position:'inner', position:'outside',
formatter: '{d}%', formatter: '{c}, {d}%',
}, },
labelLine: { labelLine: {
show: true show: true