From 9eca074ffb0dd0b9fe1111cf4eae8e642b6d5bf4 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Mon, 9 Jun 2025 20:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gather/report/utils/BookmarkUtil.java     | 38 ++++++++++---------
 .../service/impl/ResultServiceImpl.java       |  5 ++-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/report/utils/BookmarkUtil.java b/detection/src/main/java/com/njcn/gather/report/utils/BookmarkUtil.java
index 88da3827..1c6b2f41 100644
--- a/detection/src/main/java/com/njcn/gather/report/utils/BookmarkUtil.java
+++ b/detection/src/main/java/com/njcn/gather/report/utils/BookmarkUtil.java
@@ -92,24 +92,26 @@ public class BookmarkUtil {
                     }
                     idx = idx + 1;
                     parentContent.add(idx, p);
-                } else if (textFromP.startsWith(PowerIndexEnum.IMBV.getDesc())
-                        || textFromP.startsWith(PowerIndexEnum.HV.getDesc())
-                        || textFromP.startsWith(PowerIndexEnum.HI.getDesc())
-
-                ) {
-                    // 另起一页
-                    P pagePara = Docx4jUtil.getPageBreak();
-                    idx = idx + 1;
-                    parentContent.add(idx, pagePara);
-                    idx = idx + 1;
-                    parentContent.add(idx, element);
-                }else if(textFromP.startsWith("注：基波电流幅值5.000A，基波频率50.0Hz,各次间谐波电流含有率均为3.0%。")){
-                    idx = idx + 1;
-                    parentContent.add(idx, element);
-                    P pagePara = Docx4jUtil.getPageBreak();
-                    idx = idx + 1;
-                    parentContent.add(idx, pagePara);
-                } else {
+                }
+//                else if (textFromP.startsWith(PowerIndexEnum.IMBV.getDesc())
+//                        || textFromP.startsWith(PowerIndexEnum.HV.getDesc())
+//                        || textFromP.startsWith(PowerIndexEnum.HI.getDesc())
+//
+//                ) {
+//                    // 另起一页
+//                    P pagePara = Docx4jUtil.getPageBreak();
+//                    idx = idx + 1;
+//                    parentContent.add(idx, pagePara);
+//                    idx = idx + 1;
+//                    parentContent.add(idx, element);
+//                }else if(textFromP.startsWith("注：基波电流幅值5.000A，基波频率50.0Hz,各次间谐波电流含有率均为3.0%。")){
+//                    idx = idx + 1;
+//                    parentContent.add(idx, element);
+//                    P pagePara = Docx4jUtil.getPageBreak();
+//                    idx = idx + 1;
+//                    parentContent.add(idx, pagePara);
+//                }
+                else {
                     idx = idx + 1;
                     parentContent.add(idx, element);
                 }
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 04913022..d437656f 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
@@ -1314,7 +1314,7 @@ public class ResultServiceImpl implements IResultService {
                 // 持续时间，需要注意时间单位处理，默认是秒
                 String timeUnit = "s";
                 for (String tableKey : tableKeys) {
-                    if (tableKey.contains(ItemReportKeyEnum.STANDARD_DUR.getKey())) {
+                    if (tableKey.contains("standardDur")) {
                         //截取单位
                         String[] tempStr = tableKey.split(StrPool.UNDERLINE);
                         if (tempStr.length > 1) {
@@ -1322,6 +1322,7 @@ public class ResultServiceImpl implements IResultService {
                                 timeUnit = "ms";
                             }
                         }
+                        break;
                     }
                 }
                 if (Objects.nonNull(tempT.getResultData())) {
@@ -1331,7 +1332,7 @@ public class ResultServiceImpl implements IResultService {
                     testDur = PubUtils.doubleRoundStr(4, tempT.getData());
                 }
                 if (Objects.nonNull(tempT.getErrorData())) {
-                    testDur = PubUtils.doubleRoundStr(4, tempT.getErrorData().doubleValue());
+                    errorDur = PubUtils.doubleRoundStr(4, tempT.getErrorData().doubleValue());
                 }
                 if (Objects.nonNull(tempT.getIsData())) {
                     resultDur = tempT.getIsData() == 1 ? "合格" : "不合格";