diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index d710f4c..4c9e76b 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -168,9 +168,15 @@ public class ExperimentController extends JeecgController edit(@RequestBody Experiment experiment, HttpServletRequest request) { - if (StringUtils.containsAny(experiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) { + Experiment dbExp = experimentService.getById(experiment.getId()); + if (StringUtils.containsAny(dbExp.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) { return Result.error("试验状态:[" + experiment.getStatus() + "]不能进行修改!"); } + if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.STAGING)) { + experiment.setStatus(ExperimentStatus.PRE_TEST); + } else { + experiment.setStatus(dbExp.getStatus()); + } experimentService.saveWithDetail(experiment); ExperimentLog experimentLog = new ExperimentLog(); experimentLog.setExperimentId(experiment.getId());