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

backend/src/main/java/io/metersphere/api/controller/APITestController.java

@@ -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();

backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java

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

backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java

@@ -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());

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

@@ -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>
 

frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue

@@ -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);