diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/NameStandUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/NameStandUtil.java index b8fd9511..07b92660 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/NameStandUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/NameStandUtil.java @@ -92,13 +92,17 @@ public class NameStandUtil { //将acquisition_live_time保留六位有效数字 如果保留一位小数后小数点后的值是0则四舍五入保留整数,否则按正常条件四舍五入保留小数位 String numberCal = NumberFormatUtil.numberCal(LT); numberCal = df.format(Double.valueOf(numberCal)); - if(dataType.contains(DataType.SAMPLEPHD.getType())) { + // 谱类型增加 SPHDF 和 SPHDP + if(dataType.contains(DataType.SAMPLEPHD.getType()) || + dataType.contains(DataType.SPHDF.getType()) || + dataType.contains(DataType.SPHDP.getType())) { + rData = "_S_"+Fulltype+"_"+numberCal+".PHD"; - } else if(dataType.contains(DataType.GASBKPHD.getType())){ + } else if(dataType.contains(DataType.GASBKPHD.getType())) { rData = "_G_"+Fulltype+"_"+numberCal+".PHD"; - }else if(dataType.contains(DataType.DETBKPHD.getType())){ + } else if(dataType.contains(DataType.DETBKPHD.getType())) { rData = "_D_"+Fulltype+"_"+numberCal+".PHD"; - }else if(dataType.contains(DataType.QCPHD.getType())){ + } else if(dataType.contains(DataType.QCPHD.getType())) { rData = "_Q_"+Fulltype+"_"+numberCal+".PHD"; } return rData;