From b66919fe5c6e2115b87cf4e1696b4b391a3f2125 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 20 Nov 2023 16:38:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=A6=82=E6=9E=9C=E8=AF=BB=E5=8F=96=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=B0=8F=E4=BA=8E=E7=AD=89=E4=BA=8E?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E5=80=BC=E5=88=99=E8=B5=8B=E5=80=BC-9999?= =?UTF-8?q?=EF=BC=8C=E5=90=A6=E5=88=99=E6=AD=A3=E5=B8=B8=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/service/impl/GammaServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index 0be55dc0..0544e81e 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -783,7 +783,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi GardsAnalySetting analySetting = spectrumAnalysisMapper.getAnalySetting(analysis.getIdAnalysis()); if (Objects.nonNull(analySetting)) { phd.getUsedSetting().setECutAnalysis_Low(analySetting.getEcutanalysisLow()); - phd.getUsedSetting().setECutAnalysis_High((Objects.nonNull(analySetting.getEcutanalysisHigh())?analySetting.getEcutanalysisHigh():-9999)); + phd.getUsedSetting().setECutAnalysis_High((Objects.nonNull(analySetting.getEcutanalysisHigh())?(analySetting.getEcutanalysisHigh() <= phd.getUsedSetting().getECutAnalysis_Low()?-9999:analySetting.getEcutanalysisHigh()):-9999)); phd.getUsedSetting().setEnergyTolerance(analySetting.getEnergytolerance()); phd.getUsedSetting().setCalibrationPSS_high(analySetting.getCalibrationpssHigh()); phd.getUsedSetting().setCalibrationPSS_low(analySetting.getCalibrationpssLow());