diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml index 671cf586..c9c2755a 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml @@ -37,6 +37,6 @@ #{item} - AND TO_NUMBER(n.CONCENTRATION) > TO_NUMBER(n.MDC) + AND n.CONCENTRATION > n.MDC \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedManMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedManMapper.xml index 5f408b1f..9686b238 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedManMapper.xml +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedManMapper.xml @@ -37,6 +37,6 @@ #{item} - AND TO_NUMBER(n.CONCENTRATION) > TO_NUMBER(n.MDC) + AND n.CONCENTRATION > n.MDC \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java index ef0ab2af..9ebded1a 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java @@ -148,6 +148,7 @@ public class CalculateConcServiceImpl implements CalculateConcService { autoResult.putAll(calculate(nuclConcAuto, index)); for (String nuclide : nuclides) { String val = autoResult.get(nuclide); + if(StrUtil.isBlank(val)) continue; AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val); analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDARR); autoAvgs.add(analysisNuclideAvg); @@ -158,6 +159,7 @@ public class CalculateConcServiceImpl implements CalculateConcService { manResult.putAll(calculate(nuclConcMan, index)); for (String nuclide : nuclides) { String val = manResult.get(nuclide); + if(StrUtil.isBlank(val)) continue; AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val); analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDRRR); manAvgs.add(analysisNuclideAvg);