From 87c90d5f14f076644d374872fd761888f5aa3b79 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Thu, 23 Nov 2023 09:06:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8Fbeta=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90ARR=E6=8A=A5=E5=91=8A=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BF=AE=E6=94=B9=20=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8Fbeta=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90ARR=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=85=AC=E5=BC=8F=E7=9B=B8=E5=85=B3=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=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/modules/service/BlockConstant.java    | 4 ++--
 .../org/jeecg/modules/spectrum/AbstractAutoLogOrReport.java   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/BlockConstant.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/BlockConstant.java
index f51230c6..7527d300 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/BlockConstant.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/BlockConstant.java
@@ -14,8 +14,8 @@ public interface BlockConstant {
     String XE_133 = "Xe133";
     String XE_135 = "Xe135";
 
-    String CH_Contant = "CH(x)";
-    String E_Contant = "E(x)";
+    String CH_Contant = "CH(x) = ";
+    String E_Contant = "E(x) = ";
 
     String to_flag = " to ";
     String arithmetic_flag = " +/- ";
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractAutoLogOrReport.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractAutoLogOrReport.java
index 4bb3b269..9c092e6d 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractAutoLogOrReport.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractAutoLogOrReport.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.spectrum;
 
+import org.jeecg.common.util.NumberFormatUtil;
 import org.jeecg.modules.base.abstracts.AbstractLogOrReport;
 import org.jeecg.modules.base.enums.FittingEquation;
 import org.jeecg.modules.service.BlockConstant;
@@ -15,7 +16,7 @@ public abstract class AbstractAutoLogOrReport extends AbstractLogOrReport implem
     protected String calibration(Integer fitting_type, List<Double> fitting_e_c){
         String b_fittingEquation = this.getFittingEquation(fitting_type);
         for(int i=0;i<fitting_e_c.size();i++){
-            b_fittingEquation = b_fittingEquation.replace("?"+(i+1),formatToStr6(fitting_e_c.get(i)));
+            b_fittingEquation = b_fittingEquation.replace("?"+(i+1), NumberFormatUtil.numberFormat(String.valueOf(fitting_e_c.get(i))));
         }
         return b_fittingEquation;
     }

From b4f4939110cbf3670bf5d819a0162fda5aa76ec6 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Thu, 23 Nov 2023 15:30:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?beta-gamma=E5=85=AC=E7=94=A8=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E6=A8=A1=E5=9D=97=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E5=90=AF=E5=8A=A8=E7=B1=BB=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?maven?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecg-module-beta-gamma-analyser/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-beta-gamma-analyser/pom.xml b/jeecg-module-beta-gamma-analyser/pom.xml
index 30e75419..a89abeaa 100644
--- a/jeecg-module-beta-gamma-analyser/pom.xml
+++ b/jeecg-module-beta-gamma-analyser/pom.xml
@@ -19,10 +19,10 @@
 
     <dependencies>
         <!-- 引入jeecg-boot-starter-cloud依赖 -->
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-starter-cloud</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.jeecgframework.boot</groupId>-->
+<!--            <artifactId>jeecg-boot-starter-cloud</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.jeecgframework.boot</groupId>