Commit 520f83d8 authored by wdy's avatar wdy

Merge branch 'dev' into 'master'

dev - master 25

See merge request !368
parents a242efd7 107ea8c2
...@@ -871,6 +871,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -871,6 +871,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
Integer unprocessedNum = 0; Integer unprocessedNum = 0;
if (statisticsVOList != null) {
for (CaseStatisticsVO vo : statisticsVOList) { for (CaseStatisticsVO vo : statisticsVOList) {
// 忽略 // 忽略
if (Objects.equals(vo.getStatus(), "IGNORED")) { if (Objects.equals(vo.getStatus(), "IGNORED")) {
...@@ -902,6 +903,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -902,6 +903,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
response.setTestDetailsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue()); response.setTestDetailsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
} }
}
// 合规维度 // 合规维度
if (Objects.equals(str, "compliance")) { if (Objects.equals(str, "compliance")) {
// 测试用例合计 // 测试用例合计
...@@ -915,6 +918,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -915,6 +918,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
Integer unprocessedNum = 0; Integer unprocessedNum = 0;
if (statisticsVOList != null) {
for (CaseStatisticsVO vo : statisticsVOList) { for (CaseStatisticsVO vo : statisticsVOList) {
// 忽略 // 忽略
if (Objects.equals(vo.getStatus(), "IGNORED")) { if (Objects.equals(vo.getStatus(), "IGNORED")) {
...@@ -945,6 +949,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -945,6 +949,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
BigDecimal num = new BigDecimal(((double) response.getTestStandardsPassNum() / response.getTestStandards()) * 100); BigDecimal num = new BigDecimal(((double) response.getTestStandardsPassNum() / response.getTestStandards()) * 100);
response.setTestStandardsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue()); response.setTestStandardsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
} }
}
} }
} }
......
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