From b4878d4a2573a0fed2baadc9156113f91947a48f Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Tue, 21 Oct 2025 17:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A3=80=E6=B5=8B=E6=8A=A5?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/service/impl/ResultServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index 23dfa85c..14550e33 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -2135,7 +2135,11 @@ public class ResultServiceImpl implements IResultService { String phases = phaseEntry.getKey(); List harmNums = phaseEntry.getValue(); 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()) { specialCaseDesc.append("注："); - if (unComparablePhases.size() == 1) { - specialCaseDesc.append(unComparablePhases.get(0)); + // 如果只有T相，则不拼接相别 + if (unComparablePhases.size() == 1 && "T相".equals(unComparablePhases.get(0))) { + // T相不拼接相别 } else { - specialCaseDesc.append(String.join("、", unComparablePhases)); + // 其他情况拼接相别 + if (unComparablePhases.size() == 1) { + specialCaseDesc.append(unComparablePhases.get(0)); + } else { + specialCaseDesc.append(String.join("、", unComparablePhases)); + } } specialCaseDesc.append("无样本数据满足误差比较的前置条件，无法执行有效性判定。"); }