调整检测报告
This commit is contained in:
@@ -2135,7 +2135,11 @@ public class ResultServiceImpl implements IResultService {
|
|||||||
String phases = phaseEntry.getKey();
|
String phases = phaseEntry.getKey();
|
||||||
List<Integer> harmNums = phaseEntry.getValue();
|
List<Integer> harmNums = phaseEntry.getValue();
|
||||||
specialCaseDesc.append("第").append(formatHarmNumbers(harmNums, isInterHarmonic)).append("次谐波");
|
specialCaseDesc.append("第").append(formatHarmNumbers(harmNums, isInterHarmonic)).append("次谐波");
|
||||||
specialCaseDesc.append(phases).append("无样本数据满足误差比较的前置条件,无法执行有效性判定。");
|
// 如果是T相,则不拼接相别
|
||||||
|
if (!"T相".equals(phases)) {
|
||||||
|
specialCaseDesc.append(phases);
|
||||||
|
}
|
||||||
|
specialCaseDesc.append("无样本数据满足误差比较的前置条件,无法执行有效性判定。");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2359,10 +2363,16 @@ public class ResultServiceImpl implements IResultService {
|
|||||||
// 生成无法比较的描述
|
// 生成无法比较的描述
|
||||||
if (!unComparablePhases.isEmpty()) {
|
if (!unComparablePhases.isEmpty()) {
|
||||||
specialCaseDesc.append("注:");
|
specialCaseDesc.append("注:");
|
||||||
if (unComparablePhases.size() == 1) {
|
// 如果只有T相,则不拼接相别
|
||||||
specialCaseDesc.append(unComparablePhases.get(0));
|
if (unComparablePhases.size() == 1 && "T相".equals(unComparablePhases.get(0))) {
|
||||||
|
// T相不拼接相别
|
||||||
} else {
|
} else {
|
||||||
specialCaseDesc.append(String.join("、", unComparablePhases));
|
// 其他情况拼接相别
|
||||||
|
if (unComparablePhases.size() == 1) {
|
||||||
|
specialCaseDesc.append(unComparablePhases.get(0));
|
||||||
|
} else {
|
||||||
|
specialCaseDesc.append(String.join("、", unComparablePhases));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
specialCaseDesc.append("无样本数据满足误差比较的前置条件,无法执行有效性判定。");
|
specialCaseDesc.append("无样本数据满足误差比较的前置条件,无法执行有效性判定。");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user