Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into songyuanshuo

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

@@ -31,6 +31,9 @@ public class CaseResultVO {
     @ApiModelProperty("用例编号")
     private String serial_number;
 
+    @ApiModelProperty("用例编号")
+    private String sequence;
+
     @ApiModelProperty("用例开始时间")
     private Integer start_time;
 

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

@@ -171,6 +171,17 @@ public class StrategyModelTestTaskNew implements StrategyModelTestTask, Initiali
 
             List<ModelTestViewVO> list = jsonObject.getList("regulation_item_result_list",ModelTestViewVO.class);
 
+            if (list != null && !list.isEmpty()) {
+                // 遍历 ModelTestViewVO 列表
+                for (ModelTestViewVO viewVO : list) {
+                    // 遍历 case_result_list
+                    for (ModelTestResultVO resultVO : viewVO.getCase_result_list()) {
+                        // 将 sequence 的值赋给 serial_number
+                        resultVO.setSerial_number(resultVO.getSequence());
+                    }
+                }
+            }
+
             response.setStandardNum((Integer) jsonObject.get("regulation_item_count"));
 
             response.setModelTestTaskViewResponseList(list);

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

@@ -87,7 +87,7 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
                     testRecords.setRiskLevel(caseResultVO.getRisk_level() + "_risk");
                     testRecords.setTestResult(caseResultVO.getStatus());
                     testRecords.setRemediation(caseResultVO.getRemediation());
-                    testRecords.setUsecaseNo(caseResultVO.getSerial_number());
+                    testRecords.setUsecaseNo(caseResultVO.getSequence());
                     //测试开始时间
                     if (caseResultVO.getStart_time() != null) {
                         Date date = new Date(caseResultVO.getStart_time());
@@ -192,7 +192,7 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
                     testRecords.setRiskLevel(caseResultVO.getRisk_level() + "_risk");
                     testRecords.setTestResult(caseResultVO.getStatus());
                     testRecords.setRemediation(caseResultVO.getRemediation());
-                    testRecords.setUsecaseNo(caseResultVO.getSerial_number());
+                    testRecords.setUsecaseNo(caseResultVO.getSequence());
                     //测试开始时间
                     if (caseResultVO.getStart_time() != null) {
                         Date date = new Date(caseResultVO.getStart_time());