fix(base): 增加了testJob的projectId

kt-base/src/main/java/org/matrix/database/entity/TestJob.java

@@ -28,4 +28,7 @@ public class TestJob extends BaseEntity{
 
     @ApiModelProperty("备注")
     private String remark;
+
+    @ApiModelProperty("项目ID")
+    private String projectId;
 }

kt-base/src/main/java/org/matrix/database/mapper/TestJobMapper.java

@@ -15,6 +15,7 @@ public interface TestJobMapper extends BaseMapper<TestJob> {
      * 分页查询TestJob
      * @param page 分页信息
      * @param name 测试任务名（查询条件）
+     * @param projectId 项目ID(查询条件)
      * @return 带有分页的测试任务列表
      */
     @Select("<script>" +
@@ -32,7 +33,10 @@ public interface TestJobMapper extends BaseMapper<TestJob> {
             "<if test=\"name!=null and name!=''\">" +
             "and ktj.`name` like concat('%',#{name},'%')" +
             "</if>" +
+            "<if test=\"projectId!=null \">" +
+            "and ktj.`project_id` = #{projectId}" +
+            "</if>" +
             "</where>" +
             "</script>")
-    IPage<TestJobVo> pageTestJob(IPage<TestJob> page,String name);
+    IPage<TestJobVo> pageTestJob(IPage<TestJob> page,Long projectId,String name);
 }

kt-base/src/main/java/org/matrix/database/service/ITestJobService.java

@@ -17,5 +17,5 @@ public interface ITestJobService extends IService<TestJob> {
      * @param name 任务名（查询条件）
      * @return 执行记录列表
      */
-    IPage<TestJobVo> pageTestJob(String name, int pageSize, int pageNum);
+    IPage<TestJobVo> pageTestJob(Long projectId,String name, int pageSize, int pageNum);
 }

kt-base/src/main/java/org/matrix/database/service/impl/TestJobServiceImpl.java

@@ -17,8 +17,8 @@ import org.springframework.stereotype.Service;
 public class TestJobServiceImpl extends ServiceImpl<TestJobMapper, TestJob> implements ITestJobService {
 
     @Override
-    public IPage<TestJobVo> pageTestJob(String name, int pageSize, int pageNum) {
+    public IPage<TestJobVo> pageTestJob(Long projectId,String name, int pageSize, int pageNum) {
         Page<TestJob> page = new Page<>(pageNum, pageSize);
-        return baseMapper.pageTestJob(page,name);
+        return baseMapper.pageTestJob(page,projectId,name);
     }
 }

kt-web/src/main/java/org/matrix/autotest/controller/TestJobController.java

@@ -55,8 +55,10 @@ public class TestJobController {
     public ResponseEntity<CommonResultObj<IPage<TestJobVo>>> findPageTestTasks(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            @RequestParam(required = false,defaultValue = "")String name) {
-        IPage<TestJobVo> result = testJobService.pageTestJob(name, pageSize, pageNum);
+            @RequestParam(required = true)Long projectId,
+            @RequestParam(required = false,defaultValue = "")String name
+            ) {
+        IPage<TestJobVo> result = testJobService.pageTestJob(projectId,name, pageSize, pageNum);
         return CommonResult.success(result, "查询成功");
     }