From 8fae16d71520438a23ac4be963e49818bac2f0af Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Sat, 30 Dec 2023 17:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86gamma?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=86=99=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E5=AF=BC=E8=87=B4=E5=86=99=E5=85=A5?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92gamma=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E4=B8=BA=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E5=AF=BC=E8=87=B4=E6=9F=A5=E7=9C=8B=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jeecg/common/util/MyLogFormatUtil.java | 6 +++++- .../src/main/java/org/jeecg/common/util/GammaFileUtil.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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)); //换行