From 158422860d47f851039258c4adc8ffdbcf2f0d70 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Mon, 17 Feb 2025 11:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E4=B8=8B=E6=8A=A5=E5=91=8A=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/gather/report/service/impl/ReportServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/ReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/ReportServiceImpl.java index 412b3ad6..7bc158b3 100644 --- a/detection/src/main/java/com/njcn/gather/report/service/impl/ReportServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/report/service/impl/ReportServiceImpl.java @@ -409,9 +409,9 @@ public class ReportServiceImpl implements IReportService { // 要处理 2 5 7 11 23 35 43 50 // 基波 - dataModelMap.put("${" + aSymbol + "1}", devValue(adHarmonicResult.getAValue1(), baseValue, percent)); - dataModelMap.put("${" + bSymbol + "1}", devValue(adHarmonicResult.getBValue1(), baseValue, percent)); - dataModelMap.put("${" + cSymbol + "1}", devValue(adHarmonicResult.getCValue1(), baseValue, percent)); + dataModelMap.put("${" + aSymbol + "1}", devValue(adHarmonicResult.getAValue1(), 1, 1)); + dataModelMap.put("${" + bSymbol + "1}", devValue(adHarmonicResult.getBValue1(), 1, 1)); + dataModelMap.put("${" + cSymbol + "1}", devValue(adHarmonicResult.getCValue1(), 1, 1)); dataModelMap.put("${" + aSymbol + "2}", devValue(adHarmonicResult.getAValue2(), baseValue, percent)); dataModelMap.put("${" + bSymbol + "2}", devValue(adHarmonicResult.getBValue2(), baseValue, percent));