From e15047e2597795305ae052d9709511897627b807 Mon Sep 17 00:00:00 2001 From: orgin Date: Tue, 19 Dec 2023 09:28:05 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AGetSuffix=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B0=B1=E7=B1=BB=E5=9E=8B=20if=20=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/util/NameStandUtil.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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;