|
|
|
@@ -85,16 +85,9 @@ public class ExperimentServiceImpl implements ExperimentService { |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public Page<Experiment> queryByPage(Experiment experiment, PageRequest pageRequest) { |
|
|
|
// long total = this.experimentDao.count(experiment); |
|
|
|
// return new PageImpl<>(this.experimentDao.queryAllByLimit(experiment, pageRequest), pageRequest, total); |
|
|
|
List<Experiment> experimentList = this.experimentDao.queryAllByLimit(experiment, pageRequest); |
|
|
|
long total = this.experimentDao.count(experiment); |
|
|
|
// 存储所有实验的ID列表 |
|
|
|
//对于每一个从Experiment表中查询出来的id,可能有多个实例,每个实例的实验id是不同的 |
|
|
|
// for (Experiment exp: experimentList) { |
|
|
|
// List<ExperimentIns> experimentInsList = this.experimentInsService.getByExperimentId(exp.getId()); |
|
|
|
// exp.setExperimentInsList(experimentInsList); |
|
|
|
// } |
|
|
|
|
|
|
|
return new PageImpl<>(experimentList,pageRequest,total); |
|
|
|
} |
|
|
|
|