获取模块列表接口新增projectId

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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -34,8 +35,8 @@ public class AutoModuleController {
      * @return
      */
     @GetMapping("/list")
-    public JsonResult getAutoModuleList(Integer pageNum, Integer pageSize) {
-        IPage<AutoModule> autoModuleIPage = autoModuleService.getAutoModuleList(pageNum, pageSize);
+    public JsonResult getAutoModuleList(Integer pageNum, Integer pageSize, Integer projectId) {
+        IPage<AutoModule> autoModuleIPage = autoModuleService.getAutoModuleList(pageNum, pageSize, projectId);
         Map<String, Object> map = new HashMap<>();
         map.put("total", autoModuleIPage.getTotal());
         map.put("list", autoModuleIPage.getRecords());

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

@@ -5,5 +5,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 public interface AutoModuleMapper extends BaseMapper<AutoModule> {
-    IPage<AutoModule> getAutoModuleList(IPage<AutoModule> page);
+    IPage<AutoModule> getAutoModuleList(IPage<AutoModule> page, Integer projectId);
 }

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

@@ -7,5 +7,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface AutoModuleService extends IService<AutoModule> {
 
-    IPage<AutoModule> getAutoModuleList(Integer pageNum, Integer pageSize);
+    IPage<AutoModule> getAutoModuleList(Integer pageNum, Integer pageSize, Integer projectId);
 }

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

@@ -16,8 +16,8 @@ public class AutoModuleServiceImpl extends ServiceImpl<AutoModuleMapper, AutoMod
     AutoModuleMapper autoModuleMapper;
 
     @Override
-    public IPage<AutoModule> getAutoModuleList(Integer pageNum, Integer pageSize) {
+    public IPage<AutoModule> getAutoModuleList(Integer pageNum, Integer pageSize, Integer projectId) {
         IPage<AutoModule> page = new Page<>(pageNum, pageSize);
-        return autoModuleMapper.getAutoModuleList(page);
+        return autoModuleMapper.getAutoModuleList(page, projectId);
     }
 }

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

@@ -7,5 +7,8 @@
                p.`name` as projectName
         from `auto_module` a, auto_project p
         where a.`project_id` = p.`id`
+        <if test="projectId != null and projectId != ''">
+            AND a.`project_id` = #{projectId}
+        </if>
     </select>
 </mapper>
\ No newline at end of file

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

@@ -6,7 +6,7 @@
         select stc.* from scene_testcase as stc
             left join scene as sc ON stc.`scene_id`=sc.`id`
         <if test="projectId != null">
-            WHERE sc.`id`=#{projectId}
+            WHERE sc.`id`= #{projectId}
         </if>
     </select>
 </mapper>
\ No newline at end of file