Skip to content

V
vehicle-quality-review
Commit 520f83d8 authored by wdy's avatar wdy
Browse files
Options

Merge branch 'dev' into 'master' 

dev - master 25

See merge request !368
parents a242efd7 107ea8c2
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 52 deletions
quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
View file @ 520f83d8
...@@ -871,35 +871,38 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -871,35 +871,38 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
Integer unprocessedNum = 0; Integer unprocessedNum = 0;
for (CaseStatisticsVO vo : statisticsVOList) { if (statisticsVOList != null) {
// 忽略 for (CaseStatisticsVO vo : statisticsVOList) {
if (Objects.equals(vo.getStatus(), "IGNORED")) { // 忽略
ignoredNum = vo.getCount(); if (Objects.equals(vo.getStatus(), "IGNORED")) {
} ignoredNum = vo.getCount();
if (Objects.equals(vo.getStatus(), "PASSED")) { }
// 测试通过 if (Objects.equals(vo.getStatus(), "PASSED")) {
response.setTestDetailsPassNum(vo.getCount()); // 测试通过
} response.setTestDetailsPassNum(vo.getCount());
if (Objects.equals(vo.getStatus(), "FAILED")) { }
// 测试未通过 if (Objects.equals(vo.getStatus(), "FAILED")) {
response.setTestDetailsNoPassNum(vo.getCount()); // 测试未通过
response.setTestDetailsNoPassNum(vo.getCount());
}
// 处理中
if (Objects.equals(vo.getStatus(), "PROCESSING")) {
processingNum = vo.getCount();
}
// 未处理
if (Objects.equals(vo.getStatus(), "UNPROCESSED")) {
unprocessedNum = vo.getCount();
}
} }
// 处理中
if (Objects.equals(vo.getStatus(), "PROCESSING")) {
processingNum = vo.getCount();
}
// 未处理
if (Objects.equals(vo.getStatus(), "UNPROCESSED")) {
unprocessedNum = vo.getCount();
}
}
// 执行未完成 // 执行未完成
response.setTestDetailsUnderNum(processingNum + unprocessedNum); response.setTestDetailsUnderNum(processingNum + unprocessedNum);
// 测试通过率
BigDecimal num = new BigDecimal(((double) response.getTestDetailsPassNum() / response.getTestDetails()) * 100);
response.setTestDetailsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
}
// 测试通过率
BigDecimal num = new BigDecimal(((double) response.getTestDetailsPassNum() / response.getTestDetails()) * 100);
response.setTestDetailsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
} }
// 合规维度 // 合规维度
...@@ -915,35 +918,38 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -915,35 +918,38 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
Integer unprocessedNum = 0; Integer unprocessedNum = 0;
for (CaseStatisticsVO vo : statisticsVOList) { if (statisticsVOList != null) {
// 忽略 for (CaseStatisticsVO vo : statisticsVOList) {
if (Objects.equals(vo.getStatus(), "IGNORED")) { // 忽略
ignoredNum = vo.getCount(); if (Objects.equals(vo.getStatus(), "IGNORED")) {
} ignoredNum = vo.getCount();
if (Objects.equals(vo.getStatus(), "PASSED")) { }
// 测试通过 if (Objects.equals(vo.getStatus(), "PASSED")) {
response.setTestStandardsPassNum(vo.getCount()); // 测试通过
} response.setTestStandardsPassNum(vo.getCount());
if (Objects.equals(vo.getStatus(), "FAILED")) { }
// 测试未通过 if (Objects.equals(vo.getStatus(), "FAILED")) {
response.setTestStandardsNoPassNum(vo.getCount()); // 测试未通过
response.setTestStandardsNoPassNum(vo.getCount());
}
// 处理中
if (Objects.equals(vo.getStatus(), "PROCESSING")) {
processingNum = vo.getCount();
}
// 未处理
if (Objects.equals(vo.getStatus(), "UNPROCESSED")) {
unprocessedNum = vo.getCount();
}
} }
// 处理中
if (Objects.equals(vo.getStatus(), "PROCESSING")) {
processingNum = vo.getCount();
}
// 未处理
if (Objects.equals(vo.getStatus(), "UNPROCESSED")) {
unprocessedNum = vo.getCount();
}
}
// 执行未完成 // 执行未完成
response.setTestStandardsUnderNum(processingNum + unprocessedNum); response.setTestStandardsUnderNum(processingNum + unprocessedNum);
// 测试通过率
BigDecimal num = new BigDecimal(((double) response.getTestStandardsPassNum() / response.getTestStandards()) * 100);
response.setTestStandardsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
}
// 测试通过率
BigDecimal num = new BigDecimal(((double) response.getTestStandardsPassNum() / response.getTestStandards()) * 100);
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