diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java index 9ab29643..4bb4530f 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java @@ -446,7 +446,9 @@ public class DetectionServiceImpl { fData = sourceIssue.getFFreq(); } if (P.equals(type)) { - fData = sourceIssue.getFUn() * sourceIssue.getFIn(); + fData = sourceIssue.getFUn() * sourceIssue.getFIn() * 0.01; + Double finalFData = fData; + errDtlsCheckData.stream().forEach(x -> x.setValue(x.getValue() * finalFData)); } SimAndDigNonHarmonicResult result = new SimAndDigNonHarmonicResult(); String[] split = dev.get(0).getId().split("_"); 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 510ad42b..ce13576f 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 @@ -424,7 +424,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl scriptDtlsCheckDataList(PqScriptDtlsParam sourceIssue) { - Boolean valueType = pqScriptMapper.selectScriptIsValueType(sourceIssue.getScriptId()); +// Boolean valueType = pqScriptMapper.selectScriptIsValueType(sourceIssue.getScriptId()); List info = new ArrayList<>(); //获取所有下拉值情况 @@ -632,9 +632,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl