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 8909377..5164e2f 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,6 +2,7 @@ package org.jeecg.modules.database.constant; public interface ExperimentStatus { + String STAGING = "暂存"; String PRE_TEST = "试验前"; String PROGRESSING = "试验进行中"; String REPORT_AUDITING = "报告审批中"; 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 da5fe26..3846ced 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 @@ -127,6 +127,28 @@ public class ExperimentController extends JeecgController staging(@RequestBody Experiment experiment, HttpServletRequest request) { + String experimentNo = experiment.getExperimentNo(); + if (!StringUtils.startsWith(experimentNo, "KC")) { + return Result.error("实验编号格式不正确!"); + } + experiment.setStatus(ExperimentStatus.STAGING); + experimentService.saveWithDetail(experiment); + + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(experiment.getId()); + experimentLog.setLogContent("新建实验"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("暂存成功!"); + } + /** * 编辑 * @@ -246,7 +268,7 @@ public class ExperimentController extends JeecgController