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 705c7fb..bc4854c 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 @@ -24,7 +24,6 @@ import org.jeecg.modules.database.service.*; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import java.util.*; @@ -186,7 +185,7 @@ public class ExperimentController extends JeecgController edit(@RequestBody Experiment experiment, HttpServletRequest request) { Experiment dbExp = experimentService.getById(experiment.getId()); - if (StringUtils.containsAny(dbExp.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) { + if (StringUtils.containsAny(dbExp.getStatus(), ExperimentStatus.COMPLETED)) { return Result.error("试验状态:[" + dbExp.getStatus() + "]不能进行修改!"); } if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.STAGING)) { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java index ade8c99..8e0d4e6 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java @@ -25,7 +25,6 @@ import org.jeecg.modules.database.service.*; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import java.util.*; @@ -220,7 +219,7 @@ public class ExperimentReportController extends JeecgController assembleSybg(String experimentId) { Experiment experiment = experimentService.getById(experimentId); experimentService.fetchExperimentDetail(experiment); @@ -286,6 +293,7 @@ public class ExperimentDocServiceImpl extends ServiceImpl v.getUserName()).collect(Collectors.joining(",")); diff --git a/templates/sybg.docx b/templates/sybg.docx index 281df3f..c80462f 100644 Binary files a/templates/sybg.docx and b/templates/sybg.docx differ