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

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

@@ -50,4 +50,7 @@ public class TestRecords {
 
     @ApiModelProperty("修复建议")
     private String remediation;
+
+    @ApiModelProperty("测试详情")
+    private String testDetails;
 }

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

@@ -71,21 +71,19 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
         ByteArrayOutputStream bos = null;
         try {
             // 模板绝对路径--服务器
-            String fileName = "/template/receipt_template_02_27.pdf";
+            String fileName = "/template/receipt_template_03_27.pdf";
             // 读取现有模板内容
             reader = new PdfReader(fileName);
             // 创建输出流
             bos = new ByteArrayOutputStream();
             // 实例化PdfStamper准备编辑pdf内容
             ps = new PdfStamper(reader, bos);
-
             // 获取表单所有元素
             AcroFields fields = ps.getAcroFields();
 
             // 设置具体字体格式的编码, 不设置的话中文可能不会显示
             BaseFont bf = BaseFont.createFont("STSongStd-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
             fields.addSubstitutionFont(bf);
-
             // 测试数据
             InspectionReportPdfVO inspectionReportPdfVO = requireData(taskId);
 
@@ -178,7 +176,7 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
         document.close();
 
         // 上传到Minio
-        return uploadMinio(outputStream, "企业留档文件_" + taskId);
+        return uploadMinio(outputStream, "企业留档文件-" + getReportName());
     }
 
     /**

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

@@ -59,6 +59,12 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
                     for (TestRecords records : recordsList) {
                         if (Objects.equals(caseResultVO.getId(), records.getUsecaseId())) {
                             exists = true;
+
+                            if (!Objects.equals(caseResultVO.getStatus(), records.getTestResult())) {
+                                records.setTestResult(caseResultVO.getStatus());
+                                records.setRemediation(caseResultVO.getRemediation());
+                                testRecordsService.updateById(records);
+                            }
                             break;
                         }
                     }
@@ -80,12 +86,24 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
 
                     if (stepResultVOS != null && stepResultVOS.size() != 0) {
                         List<String> stepList = new ArrayList<>();
+                        List<String> testDetailsList = new ArrayList<>();
+                        int index = 1; // 序号从1开始
                         for (StepResultVO stepResultVO :stepResultVOS) {
+                            // 测试方法
                             String stepName = stepResultVO.getName();
 
-                            stepList.add(stepName);
+                            // 给每个元素加上序号
+                            String stepWithIndex = index + "." + stepName;
+
+                            stepList.add(stepWithIndex);
+                            index++;
+
+                            // 测试详情
+                            String testDetails = stepResultVO.getDescription();
+                            testDetailsList.add(testDetails);
                         }
-                        testRecords.setTestMethod(StringUtils.join(stepList,","));
+                        testRecords.setTestMethod(StringUtils.join(stepList,"`"));
+                        testRecords.setTestDetails(StringUtils.join(testDetailsList,"\n"));
                     }
 
                     list.add(testRecords);
@@ -141,12 +159,24 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
 
                     if (stepResultVOS != null && stepResultVOS.size() != 0) {
                         List<String> stepList = new ArrayList<>();
+                        List<String> testDetailsList = new ArrayList<>();
+                        int index = 1; // 序号从1开始
                         for (StepResultVO stepResultVO :stepResultVOS) {
+                            // 测试方法
                             String stepName = stepResultVO.getName();
 
-                            stepList.add(stepName);
+                            // 给每个元素加上序号
+                            String stepWithIndex = index + "." + stepName;
+
+                            stepList.add(stepWithIndex);
+                            index++;
+
+                            // 测试详情
+                            String testDetails = stepResultVO.getDescription();
+                            testDetailsList.add(testDetails);
                         }
-                        testRecords.setTestMethod(StringUtils.join(stepList,","));
+                        testRecords.setTestMethod(StringUtils.join(stepList,"`"));
+                        testRecords.setTestDetails(StringUtils.join(testDetailsList,"\n"));
                     }
 
                     list.add(testRecords);

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

@@ -16,12 +16,13 @@
             <result property="testMethod" column="test_method" jdbcType="LONGNVARCHAR"/>
             <result property="testResult" column="test_result" jdbcType="VARCHAR"/>
             <result property="remediation" column="remediation" jdbcType="VARCHAR"/>
+            <result property="testDetails" column="test_details" jdbcType="LONGNVARCHAR"/>
     </resultMap>
-        <select id="findByTaskId" resultType="com.ruoyi.domain.TestRecords">
-            SELECT id, project_id, task_id, usecase, usecase_id, test_time, description, risk_level, test_method, test_result, remediation
-            FROM t_test_records
-            WHERE project_id = #{id}
-        </select>
+    <select id="findByTaskId" resultType="com.ruoyi.domain.TestRecords">
+        SELECT id, project_id, task_id, usecase, usecase_id, test_time, description, risk_level, test_method, test_result, remediation, test_details
+        FROM t_test_records
+        WHERE project_id = #{id}
+    </select>
 
 
 </mapper>