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 ea5224a..2905b6f 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 @@ -305,6 +305,28 @@ public class ExperimentController extends JeecgController checkCanReport(@RequestParam(name = "id", required = true) String id) { + Experiment experiment = experimentService.getById(id); + if (experiment == null) { + return Result.error("未找到试验数据!"); + } + List experimentTestProcesses = experimentTestProcessService.getByExperimentId(experiment.getId()); + List radiationProcessList = experimentRadiationProcessService.getByExperimentId(experiment.getId()); + List experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId()); + if (CollUtil.isEmpty(experimentTestProcesses)) { + return Result.error("未填写测试过程!"); + } + if (CollUtil.isEmpty(radiationProcessList)) { + return Result.error("未填写辐照过程!"); + } + if (CollUtil.isEmpty(experimentAnnealProcessList)) { + return Result.error("未填写退火过程!"); + } + return Result.OK(); + } + /** * 导出excel *