Skip to content

V
vehicle-quality-review
Commit b52bff1c authored by 盖献康's avatar 盖献康
Browse files
Options

Merge branch 'dev' of... 

Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wangfei/vehicle-quality-review into gaixiankang
parents d987ede0 6d11cada
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 84 deletions
quality-review/src/main/java/com/ruoyi/service/impl/TestRecordsServiceImpl.java
View file @ b52bff1c
...@@ -116,12 +116,12 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR ...@@ -116,12 +116,12 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
// 测试详情 // 测试详情
String testDetails = stepResultVO.getDescription(); String testDetails = stepResultVO.getDescription();
if (testDetails != null) { if (testDetails != null) {
convertMarkdownToHtml(testDetails); testDetails = convertMarkdownToHtml(testDetails);
} }
testDetailsVO += testDetails + "`"; testDetailsVO += testDetails + "<br> ";
} }
testDetailsVO = testDetailsVO.substring(0, testDetailsVO.length() - 1); testDetailsVO = testDetailsVO.substring(0, testDetailsVO.length() - 1);
testRecords.setTestMethod(StringUtils.join(stepList,"`")); testRecords.setTestMethod(StringUtils.join(stepList,"\n"));
testRecords.setTestDetails(testDetailsVO); testRecords.setTestDetails(testDetailsVO);
} }
...@@ -202,7 +202,7 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR ...@@ -202,7 +202,7 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
// 测试详情 // 测试详情
String testDetails = stepResultVO.getDescription(); String testDetails = stepResultVO.getDescription();
if (testDetails != null) { if (testDetails != null) {
convertMarkdownToHtml(testDetails); testDetails = convertMarkdownToHtml(testDetails);
} }
testDetailsVO += testDetails + "`"; testDetailsVO += testDetails + "`";
} }
...@@ -237,7 +237,7 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR ...@@ -237,7 +237,7 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
// jsoup标准化标签，生成闭合标签 // jsoup标准化标签，生成闭合标签
doc.outputSettings().syntax(org.jsoup.nodes.Document.OutputSettings.Syntax.xml); doc.outputSettings().syntax(org.jsoup.nodes.Document.OutputSettings.Syntax.xml);
doc.outputSettings().escapeMode(Entities.EscapeMode.xhtml); doc.outputSettings().escapeMode(Entities.EscapeMode.xhtml);
return doc.html(); return doc.body().html();
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment