能否生成报告 去掉测试过程,退火过程的校验
This commit is contained in:
@@ -420,18 +420,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
|||||||
if (experiment == null) {
|
if (experiment == null) {
|
||||||
return Result.error("未找到试验数据!");
|
return Result.error("未找到试验数据!");
|
||||||
}
|
}
|
||||||
List<ExperimentTestProcess> experimentTestProcesses = experimentTestProcessService.getByExperimentId(experiment.getId());
|
|
||||||
List<ExperimentRadiationProcess> radiationProcessList = experimentRadiationProcessService.getByExperimentId(experiment.getId());
|
List<ExperimentRadiationProcess> radiationProcessList = experimentRadiationProcessService.getByExperimentId(experiment.getId());
|
||||||
List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
|
|
||||||
if (CollUtil.isEmpty(experimentTestProcesses)) {
|
|
||||||
return Result.error("未填写测试过程!");
|
|
||||||
}
|
|
||||||
if (CollUtil.isEmpty(radiationProcessList)) {
|
if (CollUtil.isEmpty(radiationProcessList)) {
|
||||||
return Result.error("未填写辐照过程!");
|
return Result.error("未填写辐照过程!");
|
||||||
}
|
}
|
||||||
if (CollUtil.isEmpty(experimentAnnealProcessList)) {
|
|
||||||
return Result.error("未填写退火过程!");
|
|
||||||
}
|
|
||||||
return Result.OK();
|
return Result.OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user