update
This commit is contained in:
@@ -2,6 +2,7 @@ package org.jeecg.modules.database.constant;
|
||||
|
||||
public interface ExperimentStatus {
|
||||
|
||||
String STAGING = "暂存";
|
||||
String PRE_TEST = "试验前";
|
||||
String PROGRESSING = "试验进行中";
|
||||
String REPORT_AUDITING = "报告审批中";
|
||||
|
||||
@@ -127,6 +127,28 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "试验管理-暂存")
|
||||
@Operation(summary = "试验管理-暂存")
|
||||
@RequiresPermissions("database:experiment:add")
|
||||
@PostMapping(value = "/staging")
|
||||
public Result<String> 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<Experiment, IExperimen
|
||||
* @param request
|
||||
* @param experiment
|
||||
*/
|
||||
|
||||
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, Experiment experiment) {
|
||||
return super.exportXls(request, experiment, Experiment.class, "试验管理");
|
||||
|
||||
Reference in New Issue
Block a user