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 fitting_e_c){ String b_fittingEquation = this.getFittingEquation(fitting_type); for(int i=0;i - - org.jeecgframework.boot - jeecg-boot-starter-cloud - + + + + org.jeecgframework.boot