update
This commit is contained in:
@@ -168,9 +168,15 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
|||||||
@RequiresPermissions("database:experiment:edit")
|
@RequiresPermissions("database:experiment:edit")
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||||
public Result<String> edit(@RequestBody Experiment experiment, HttpServletRequest request) {
|
public Result<String> 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() + "]不能进行修改!");
|
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);
|
experimentService.saveWithDetail(experiment);
|
||||||
ExperimentLog experimentLog = new ExperimentLog();
|
ExperimentLog experimentLog = new ExperimentLog();
|
||||||
experimentLog.setExperimentId(experiment.getId());
|
experimentLog.setExperimentId(experiment.getId());
|
||||||
|
|||||||
Reference in New Issue
Block a user