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

Merge remote-tracking branch 'origin/station' into station

Browse Source
This commit is contained in:
nieziyan 2023-09-12 10:25:17 +08:00
commit 3707146ad2
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/NameStandUtil.java
View File

@ -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;

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
View File

@ -613,7 +613,7 @@
XE_RESULTS.IDANALYSIS = #{idAnalysis}
</select>
<select id="getFULLNuclideNames" resultType="java.lang.String">
<select id="getUserNuclideNames" resultType="java.lang.String">
select
distinct a.name
from