From aa5f57a85655d109a9f360709448d92021b32086 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Tue, 22 Apr 2025 14:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9A=82=E6=80=81=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E5=B9=85=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/gather/err/pojo/po/PqErrSysDtls.java | 6 +-----
 .../gather/script/service/impl/PqScriptDtlsServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSysDtls.java b/detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSysDtls.java
index b7fa9e9a..1fb17b14 100644
--- a/detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSysDtls.java
+++ b/detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSysDtls.java
@@ -60,10 +60,6 @@ public class PqErrSysDtls implements Serializable {
      */
     private Integer endFlag;
 
-    /**
-     * 单位
-     */
-//    private String unit;
 
     /**
      * 判断条件值类型（包括值类型，绝对值、相对值）
@@ -77,7 +73,7 @@ public class PqErrSysDtls implements Serializable {
     private Double maxErrorValue;
 
     /**
-     * 误差值类型
+     * 误差值类型(绝对值:0:标称值	1:标准值 2:值比较 	相对值:0标称值 1:标准值)
      */
     private Integer errorValueType;
 
diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
index 313e341f..7881da5a 100644
--- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
@@ -1014,9 +1014,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                             dipDataDTO.setFTransValue(dip.getTransValue());
                             if (devFly) {
                                 if (isValueType) {
-                                    dipDataDTO.setFTransValue(dip.getTransValue() * (dtls.getValue() * 0.01));
-                                } else {
                                     dipDataDTO.setFTransValue(dip.getTransValue());
+                                } else {
+                                    dipDataDTO.setFTransValue(NumberUtil.round(dip.getTransValue() / dtls.getValue(), 4).doubleValue());
                                 }
                             }
                             //  1.0/频率*持续时间（周波）= 暂态持续时间（s）