diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java index b5fc9ab..b253e27 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java @@ -2,10 +2,10 @@ package org.jeecg.modules.database.constant; public interface ExperimentStatus { - String STAGING = "暂存"; - String PRE_TEST = "试验前"; - String PROGRESSING = "试验进行中"; - String REPORT_AUDITING = "报告审批中"; - String COMPLETED = "试验完成"; - String REVIEWED = "已审核"; + String STAGING = "暂存"; + String PRE_TEST = "试验前"; + String PROGRESSING = "试验进行中"; + //String REPORT_AUDITING = "报告审批中"; + String COMPLETED = "试验完成"; + String REVIEWED = "已审核"; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java index 738eed5..e672e29 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java @@ -100,7 +100,7 @@ public class ExperimentAnnealProcessController extends JeecgController join(Page page, Experiment experiment, SysUser loginUser) { - return baseMapper.join(page, experiment,loginUser); + return baseMapper.join(page, experiment, loginUser); } - @Override public Long sumLhs() { return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L);