fix(项目报告): 项目报告邮件内容的国际化问题修改

--bug=1008935 --user=宋天阳 【报表管理】项目报告,邮件内容和预览不一致
https://www.tapd.cn/55049933/s/1083747
This commit is contained in:
song-tianyang 2021-12-20 19:47:42 +08:00 committed by 刘瑞斌
parent 2e6b48d9be
commit a4189a3cdd
8 changed files with 10 additions and 7 deletions

View File

@ -146,7 +146,7 @@ public class ReportStatisticsService {
yaxis = new ArrayList<>();
}
TestCaseCountTableDataDTO returnDTO = new TestCaseCountTableDataDTO();
String[] headers = new String[]{groupName, "总计", "testCase", "apiCase", "scenarioCase", "loadCaseCount"};
String[] headers = new String[]{groupName, "Count", "testCase", "apiCase", "scenarioCase", "loadCaseCount"};
List<TestCaseCountTableItemDataDTO> heads = new ArrayList<>();
boolean showTestCase = true;
@ -155,7 +155,7 @@ public class ReportStatisticsService {
boolean showLoad = true;
for (String head : headers) {
if (StringUtils.equalsAnyIgnoreCase(head, groupName, "总计") || yaxis.contains(head)) {
if (StringUtils.equalsAnyIgnoreCase(head, groupName, "Count") || yaxis.contains(head)) {
TestCaseCountTableItemDataDTO headData = new TestCaseCountTableItemDataDTO();
headData.setId(UUID.randomUUID().toString());
headData.setValue(head);

View File

@ -113,7 +113,7 @@ public class TestAnalysisService {
List<Integer> upCollect = dtos.stream().map(item -> Integer.valueOf(item.getUpdateCount())).collect(Collectors.toList());
// reduce求和
Optional<Integer> updateCount = upCollect.stream().reduce(Integer::sum);
dtos.add(new TestAnalysisTableDTO("总计", createCount.get().toString(), updateCount.get().toString(), new LinkedList<>()));
dtos.add(new TestAnalysisTableDTO("Count", createCount.get().toString(), updateCount.get().toString(), new LinkedList<>()));
TestAnalysisResult testAnalysisResult = new TestAnalysisResult();
testAnalysisResult.setChartDTO(dto);

View File

@ -338,7 +338,7 @@ public class TestCaseCountService {
private TestCaseCountTableDataDTO countShowTable(String groupName, List<String> yaxis, List<TestCaseCountTableDTO> dtos) {
TestCaseCountTableDataDTO returnDTO = new TestCaseCountTableDataDTO();
String[] headers = new String[]{groupName, "总计", "testCase", "apiCase", "scenarioCase", "loadCaseCount"};
String[] headers = new String[]{groupName, "Count", "testCase", "apiCase", "scenarioCase", "loadCaseCount"};
List<TestCaseCountTableItemDataDTO> heads = new ArrayList<>();
boolean showTestCase = true;
@ -346,7 +346,7 @@ public class TestCaseCountService {
boolean showScenario = true;
boolean showLoad = true;
for (String head : headers) {
if (StringUtils.equalsAnyIgnoreCase(head, groupName, "总计") || yaxis.contains(head)) {
if (StringUtils.equalsAnyIgnoreCase(head, groupName, "Count") || yaxis.contains(head)) {
TestCaseCountTableItemDataDTO headData = new TestCaseCountTableItemDataDTO();
headData.setId(UUID.randomUUID().toString());
headData.setValue(head);

View File

@ -18,7 +18,7 @@
</el-table-column>
<el-table-column
prop="allCount"
label="总计">
:label="$t('commons.report_statistics.count')">
</el-table-column>
<el-table-column
prop="testCaseCount"

@ -1 +1 @@
Subproject commit ebae9a17065b354f9357edc023de7a0ce64e2cf5
Subproject commit 15c9f3a9bc321f4efa609f83cbbb81df98720852

View File

@ -345,6 +345,7 @@ export default {
bar: "Bar",
desc: "Desc",
asc: "Asc",
count: "Count",
report_data: {
all_report: "All report",
my_report: "My report",

View File

@ -346,6 +346,7 @@ export default {
bar: "柱状图",
desc: "总数从高到低",
asc: "总数从低到高",
count: "总计",
report_data: {
all_report: "全部报表",
my_report: "我的报表",

View File

@ -346,6 +346,7 @@ export default {
bar: "柱狀圖",
desc: "總數從高到低",
asc: "總數從低到高",
count: "總計",
report_data: {
all_report: "全部報表",
my_report: "我的報表",