xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：GetSuffix 增加谱类型 if 判断

Browse Source
This commit is contained in:
orgin 2023-12-19 09:28:05 +08:00
parent aeeec179ad
commit e15047e259
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/NameStandUtil.java
View File

@ -92,13 +92,17 @@ public class NameStandUtil {
//将acquisition_live_time保留六位有效数字 如果保留一位小数后小数点后的值是0则四舍五入保留整数，否则按正常条件四舍五入保留小数位 //将acquisition_live_time保留六位有效数字 如果保留一位小数后小数点后的值是0则四舍五入保留整数，否则按正常条件四舍五入保留小数位
String numberCal = NumberFormatUtil.numberCal(LT); String numberCal = NumberFormatUtil.numberCal(LT);
numberCal = df.format(Double.valueOf(numberCal)); 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"; rData = "_S_"+Fulltype+"_"+numberCal+".PHD";
} else if(dataType.contains(DataType.GASBKPHD.getType())){ } else if(dataType.contains(DataType.GASBKPHD.getType())) {
rData = "_G_"+Fulltype+"_"+numberCal+".PHD"; rData = "_G_"+Fulltype+"_"+numberCal+".PHD";
}else if(dataType.contains(DataType.DETBKPHD.getType())){ } else if(dataType.contains(DataType.DETBKPHD.getType())) {
rData = "_D_"+Fulltype+"_"+numberCal+".PHD"; rData = "_D_"+Fulltype+"_"+numberCal+".PHD";
}else if(dataType.contains(DataType.QCPHD.getType())){ } else if(dataType.contains(DataType.QCPHD.getType())) {
rData = "_Q_"+Fulltype+"_"+numberCal+".PHD"; rData = "_Q_"+Fulltype+"_"+numberCal+".PHD";
} }
return rData; return rData;