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

Merge remote-tracking branch 'origin/v1.7' into v1.7

This commit is contained in:
Captain.B 2021-02-02 10:54:08 +08:00
parent 99b46de258 172ff3d92d
commit d21ec14290
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/api/controller/APITestController.java
View File

@ -314,11 +314,7 @@ public class APITestController {
apiCountResult.setThisWeekExecutedCount(executedInThisWeekCountNumber);
//统计 失败 成功 以及总数
// List<ApiDataCountResult> api_allExecuteResult = apiReportService.countByProjectIdGroupByExecuteResult(projectId);
List<ApiDataCountResult> allExecuteResult = apiScenarioReportService.countByProjectIdGroupByExecuteResult(projectId);
// List<ApiDataCountResult> allExecuteResult = new ArrayList<>();
// allExecuteResult.addAll(api_allExecuteResult);
// allExecuteResult.addAll(scene_allExecuteResult);
apiCountResult.countScheduleExecute(allExecuteResult);
long allCount = apiCountResult.getExecutedCount();

2
backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
View File

@ -216,4 +216,6 @@ public class ApiDefinitionController {
public String preview(@RequestBody String jsonSchema) {
return JSONSchemaGenerator.getJson(jsonSchema);
}
}

9
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -103,6 +103,15 @@ public class ApiAutomationService {
if (setDefultOrders) {
request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
}
if(StringUtils.isNotEmpty(request.getExecuteStatus())){
Map<String,List<String>> statusFilter = new HashMap<>();
List<String> list = new ArrayList<>();
list.add("Prepare");
list.add("Underway");
list.add("Completed");
statusFilter.put("status",list);
request.setFilters(statusFilter);
}
if (checkThisWeekData) {
if (request.isSelectThisWeedData()) {
Map<String, Date> weekFirstTimeAndLastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date());

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
View File

@ -304,7 +304,7 @@
<select id="countRunResultByProjectID" resultType="io.metersphere.api.dto.datacount.ApiDataCountResult">
SELECT count(id) AS countNumber, if(last_result is null,"notRun",last_result) AS groupField FROM api_scenario
WHERE project_id = #{0}
WHERE project_id = #{0} AND status != 'Trash'
GROUP BY groupField
</select>

4
frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
View File

@ -278,7 +278,9 @@
url = "/api/testcase/update";
} else {
tmp.request.path = this.api.path;
tmp.request.method = this.api.method;
if (tmp.request.protocol != "dubbo://" && tmp.request.protocol != "DUBBO") {
tmp.request.method = this.api.method;
}
}
if (tmp.tags instanceof Array) {
tmp.tags = JSON.stringify(tmp.tags);