diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/NameStandUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/NameStandUtil.java index 86613560..711c2320 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/NameStandUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/NameStandUtil.java @@ -87,21 +87,31 @@ public class NameStandUtil { public String GetSuffix(String dataType,String sysType,String Fulltype,String LT) { String rData = ""; BigDecimal bd = new BigDecimal(LT); + //将acquisition_live_time保留一位小数 如果保留一位小数后小数点后的值是0则四舍五入保留整数,否则按正常条件四舍五入保留小数位 + String scale = bd.setScale(1, RoundingMode.HALF_UP).toString(); if(dataType.contains(DataType.SAMPLEPHD.getType())) { - if (LT.indexOf(".0") > 0) { + if (scale.indexOf(".0") > 0) { bd = bd.setScale(0, RoundingMode.HALF_UP); } else { bd = bd.setScale(1, RoundingMode.HALF_UP); } rData = "_S_"+Fulltype+"_"+bd+".PHD"; } else if(dataType.contains(DataType.GASBKPHD.getType())){ - bd = bd.setScale(1, RoundingMode.HALF_UP); + if (scale.indexOf(".0") > 0) { + bd = bd.setScale(0, RoundingMode.HALF_UP); + } else { + bd = bd.setScale(1, RoundingMode.HALF_UP); + } rData = "_G_"+Fulltype+"_"+bd+".PHD"; }else if(dataType.contains(DataType.DETBKPHD.getType())){ bd = bd.setScale(0, RoundingMode.HALF_UP); rData = "_D_"+Fulltype+"_"+bd+".PHD"; }else if(dataType.contains(DataType.QCPHD.getType())){ - bd = bd.setScale(2, RoundingMode.HALF_UP); + if (scale.indexOf(".0") > 0) { + bd = bd.setScale(0, RoundingMode.HALF_UP); + } else { + bd = bd.setScale(2, RoundingMode.HALF_UP); + } rData = "_Q_"+Fulltype+"_"+bd+".PHD"; } return rData; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml index 8fc657af..7276fa95 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml @@ -613,7 +613,7 @@ XE_RESULTS.IDANALYSIS = #{idAnalysis} - select distinct a.name from