Merge branch 'gaixiankang' into 'dev'

测试矩阵 - ID返回值变为科恩数据

See merge request !203

quality-review/src/main/java/com/ruoyi/domain/TestUseCase.java

@@ -87,6 +87,9 @@ public class TestUseCase implements Serializable {
     @TableField(exist = false)
     private String testType;
 
+    @ApiModelProperty("用例ID")
+    private String caseId;
+
     /**
      * 返回用例在矩阵中的坐标
      * @return
@@ -95,4 +98,4 @@ public class TestUseCase implements Serializable {
         return String.valueOf(testScenarioId) + String.valueOf(testTypeId);
     }
 
-}
\ No newline at end of file
+}

quality-review/src/main/java/com/ruoyi/service/impl/MatrixServiceImpl.java

@@ -73,8 +73,8 @@ public class MatrixServiceImpl implements MatrixService {
             for(TestType type : types) {
                 String columnId = String.valueOf(type.getId());
                 String coordinates = scenario.getId() + columnId;
-                Long useCaseId = getUseCaseIdByCoordinates(useCases, coordinates);
-                row.put(columnId, useCaseId == null ? "" : String.valueOf(useCaseId));
+                String useCaseId = getUseCaseIdByCoordinates(useCases, coordinates);
+                row.put(columnId, useCaseId == null ? "" : useCaseId);
             }
 
             rows.add(row);
@@ -83,11 +83,11 @@ public class MatrixServiceImpl implements MatrixService {
         response.setRows(rows);
     }
 
-    public Long getUseCaseIdByCoordinates(List<TestUseCase> useCases, String coordinates) {
+    public String getUseCaseIdByCoordinates(List<TestUseCase> useCases, String coordinates) {
 
         for(TestUseCase useCase : useCases) {
             if(useCase.getCoordinates().equals(coordinates)) {
-                return useCase.getId();
+                return useCase.getCaseId();
             }
         }
         return null;