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 b253e27..593a780 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 @@ -7,5 +7,5 @@ public interface ExperimentStatus { String PROGRESSING = "试验进行中"; //String REPORT_AUDITING = "报告审批中"; String COMPLETED = "试验完成"; - String REVIEWED = "已审核"; + 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 c48874c..c36d74b 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,8 @@ public class ExperimentAnnealProcessController extends JeecgController edit(@RequestBody Experiment experiment, HttpServletRequest request) { Experiment dbExp = experimentService.getById(experiment.getId()); - if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.COMPLETED)) { + if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExp.getStatus(), + ExperimentStatus.REVIEWED)) { return Result.error("试验状态:[" + dbExp.getStatus() + "]不能进行修改!"); } if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.STAGING)) { @@ -290,7 +291,10 @@ public class ExperimentController extends JeecgController