Merge branch 'gaixiankang' into 'dev'

车型试验 - 待签字页面 - 查看

See merge request !218

quality-review/src/main/java/com/ruoyi/domain/vo/TestCaseVO.java

@@ -39,4 +39,7 @@ public class TestCaseVO {
     @ApiModelProperty("用例描述")
     private String description;
 
+    @ApiModelProperty("测试结果")
+    private String testResult;
+
 }

quality-review/src/main/java/com/ruoyi/domain/vo/TestUsecaseVO.java

@@ -57,4 +57,7 @@ public class TestUsecaseVO {
     @ApiModelProperty("标准测试方法")
     private String testMethod;
 
+    @ApiModelProperty("测试结果")
+    private String testResult;
+
 }

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

@@ -47,8 +47,18 @@ public class StrategyModelTestTaskNew implements StrategyModelTestTask, Initiali
      */
     @Override
     public List<ModelTestTaskViewResponse> doView(ModelTestTask modelTestTask) {
+        List<ModelTestTaskViewResponse> list = getTestScheme(modelTestTask.getId());
+        return list;
+    }
+
+    /**
+     * 获取试验方案
+     * @param taskId
+     * @return
+     */
+    public List<ModelTestTaskViewResponse> getTestScheme(Long taskId) {
         // 查询出本子任务所包含的测试场景集合
-        List<TestUsecaseVO> testCaseList = testUseCaseMapper.selectListByTaskId(modelTestTask.getId());
+        List<TestUsecaseVO> testCaseList = testUseCaseMapper.selectListByTaskId(taskId);
         // 创建一个空List, 用于返回数据
         List<ModelTestTaskViewResponse> list = new ArrayList<>();
         // 创建一个HashMap, 用于存放数据。用例条款ID作为key

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

@@ -42,9 +42,13 @@ public class StrategyModelTestTaskSigned implements StrategyModelTestTask, Initi
     @Autowired
     private TaskStateFacade taskStateFacade;
 
+    @Autowired
+    private StrategyModelTestTaskNew strategyModelTestTaskNew;
+
     @Override
     public List<ModelTestTaskViewResponse> doView(ModelTestTask modelTestTask) {
-        throw new ServiceException("能查看一个已确认的任务", HttpStatus.ERROR);
+        List<ModelTestTaskViewResponse> list = strategyModelTestTaskNew.getTestScheme(modelTestTask.getId());
+        return list;
     }
 
     @Override

quality-review/src/main/resources/mapper/TestUseCaseMapper.xml

@@ -62,7 +62,8 @@
             tu.review_standard_id,
             rs.chapter,
             rs.text,
-            rs.test_method testMethod
+            rs.test_method testMethod,
+            tr.test_result testResult
         from
             t_test_usecase tu
         left join t_test_scenario ts on tu.test_scenario_id = ts.id
@@ -71,6 +72,7 @@
         left join t_task_scenario_relation tsr on tsr.test_scenario_id = ts.id
         left join t_task t on tsr.task_id = t.id
         left join t_model_test_task mtt on mtt.id = t.model_test_task_id
+        left join t_test_records tr on tu.case_id = tr.usecase_id
         where
             mtt.id = #{id}
     </select>