diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyLogFormatUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyLogFormatUtil.java index 27e04bbe..aa6689de 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyLogFormatUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyLogFormatUtil.java @@ -335,7 +335,11 @@ public class MyLogFormatUtil { public static List getValuePoint(List source, int num) { List result = Lists.newLinkedList(); for (String str : source) { - result.add(String.format("%." + num + "f", Double.parseDouble(str))); + if (StringUtils.isNotBlank(str)) { + result.add(String.format("%." + num + "f", Double.parseDouble(str))); + } else { + result.add("null"); + } } return result; } diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java index 80cbe987..9ef9229d 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java @@ -2607,7 +2607,7 @@ public class GammaFileUtil extends AbstractLogOrReport { String data16 = "Name : %-15s Pass/Fail : %-9s Value : %-14s Test : %-16s"; String qcName = middleData.QC_CHECK_QC_NAME.get(i); String qcResult = middleData.QC_CHECK_QC_RESULT.get(i).equals("0") ? "Fail" : "Pass"; - String qcValue = String.format("%.3f", Double.valueOf(middleData.QC_CHECK_QC_VALUE.get(i))); + String qcValue = StringUtils.isBlank(middleData.QC_CHECK_QC_VALUE.get(i))?"null":String.format("%.3f", Double.valueOf(middleData.QC_CHECK_QC_VALUE.get(i))); String standard = middleData.QC_CHECK_QC_STANDARD.get(i); strBuffer.append(rowFormat(data16, qcName, qcResult, qcValue, standard)); //换行