优化场景报告列表接口

src/main/java/cn/qg/holmes/controller/auto/TestReportController.java

@@ -56,8 +56,8 @@ public class TestReportController {
      * @return
      */
     @GetMapping("/scene/batch/list")
-    public JsonResult getSceneTestcaseReportBatchList(String namespace, Integer projectId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        IPage<Map<String, Object>> sceneTestcaseReportIPage = sceneTestcaseReportService.getSceneTestcaseReportGroupByBatch(namespace, projectId, pageNum, pageSize);
+    public JsonResult getSceneTestcaseReportBatchList(String namespace, Integer projectId, Integer sceneId, String sceneName, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        IPage<Map<String, Object>> sceneTestcaseReportIPage = sceneTestcaseReportService.getSceneTestcaseReportGroupByBatch(namespace, projectId, sceneId, sceneName, pageNum, pageSize);
         Map<String, Object> map = new HashMap<>();
         map.put("total", sceneTestcaseReportIPage.getTotal());
         map.put("list", sceneTestcaseReportIPage.getRecords());

src/main/java/cn/qg/holmes/mapper/auto/SceneTestcaseReportMapper.java

@@ -7,5 +7,5 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.Map;
 
 public interface SceneTestcaseReportMapper extends BaseMapper<SceneTestcaseReport> {
-    IPage<Map<String, Object>> getSceneTestcaseReportGroupByBatch(String namespace, Integer projectId, IPage<Map<String, Object>> page);
+    IPage<Map<String, Object>> getSceneTestcaseReportGroupByBatch(String namespace, Integer projectId, Integer sceneId, String sceneName, IPage<Map<String, Object>> page);
 }

src/main/java/cn/qg/holmes/service/auto/SceneTestcaseReportService.java

@@ -10,5 +10,5 @@ public interface SceneTestcaseReportService extends IService<SceneTestcaseReport
 
     Map<String, Object> getSceneTestcaseReportListByNamespace(String namespace, Integer moduleId, Integer pageNum, Integer pageSize);
 
-    IPage<Map<String, Object>> getSceneTestcaseReportGroupByBatch(String namespace, Integer projectId, Integer pageNum, Integer pageSize);
+    IPage<Map<String, Object>> getSceneTestcaseReportGroupByBatch(String namespace, Integer projectId, Integer sceneId, String sceneName, Integer pageNum, Integer pageSize);
 }

src/main/java/cn/qg/holmes/service/auto/impl/SceneTestcaseReportServiceImpl.java

@@ -40,8 +40,8 @@ public class SceneTestcaseReportServiceImpl extends ServiceImpl<SceneTestcaseRep
     }
 
     @Override
-    public IPage<Map<String, Object>> getSceneTestcaseReportGroupByBatch(String namespace, Integer projectId, Integer pageNum, Integer pageSize) {
+    public IPage<Map<String, Object>> getSceneTestcaseReportGroupByBatch(String namespace, Integer projectId, Integer sceneId, String sceneName, Integer pageNum, Integer pageSize) {
         IPage<Map<String, Object>> page = new Page<>(pageNum, pageSize);
-        return sceneTestcaseReportMapper.getSceneTestcaseReportGroupByBatch(namespace, projectId, page);
+        return sceneTestcaseReportMapper.getSceneTestcaseReportGroupByBatch(namespace, projectId, sceneId, sceneName, page);
     }
 }

src/main/resources/mapper/auto/SceneTestcaseReportMapper.xml

@@ -3,14 +3,31 @@
 <mapper namespace="cn.qg.holmes.mapper.auto.SceneTestcaseReportMapper">
 
     <select id="getSceneTestcaseReportGroupByBatch" resultType="java.util.Map">
-        SELECT st.`scene_id` as sceneId, st.`batch`, st.`namespace`, st.`project_id` as projectId, pro.`name` as projectName, st.`create_time` as createTime from `scene_testcase_report` st
-            left join `auto_project` pro on st.`project_id` = pro.`id` WHERE 1=1
+        SELECT st.`scene_id` as sceneId,
+               st.`batch`,
+               st.`namespace`,
+               st.`project_id` as projectId,
+               pro.`name` as projectName,
+               sc.`name` as sceneName,
+               st.`create_time` as createTime
+        FROM `scene_testcase_report` st
+        INNER JOIN `auto_project` pro
+        ON st.`project_id` = pro.`id`
+        INNER JOIN `scene` sc
+        ON st.`scene_id` = sc.id
+        WHERE 1=1
         <if test="projectId != null and projectId !=''">
           AND st.`project_id` = #{projectId}
         </if>
         <if test="namespace != null and namespace != ''">
             AND st.`namespace` = #{namespace}
         </if>
+        <if test="sceneId != null and sceneId != ''">
+            AND st.`scene_id` = #{sceneId}
+        </if>
+        <if test="sceneName != null and sceneName != ''">
+            AND sc.`name` LIKE CONCAT('%', #{sceneName}, '%')
+        </if>
         GROUP BY st.`batch`
     </select>