|
@@ -75,7 +75,7 @@ public class ExamOrgReportServiceImpl implements ExamOrgReportService {
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
};
|
|
};
|
|
|
|
|
|
- Sort sort = new Sort(Direction.ASC, "id");
|
|
|
|
|
|
+ Sort sort = Sort.by(Direction.ASC, "id");
|
|
List<ExamOrgReportEntity> orgEntityList = examOrgReportRepo.findAll(specification, sort);
|
|
List<ExamOrgReportEntity> orgEntityList = examOrgReportRepo.findAll(specification, sort);
|
|
List<ExamOrgReportMainBean> ret = new ArrayList<ExamOrgReportMainBean>();
|
|
List<ExamOrgReportMainBean> ret = new ArrayList<ExamOrgReportMainBean>();
|
|
for (ExamOrgReportEntity e : orgEntityList) {
|
|
for (ExamOrgReportEntity e : orgEntityList) {
|
|
@@ -128,7 +128,7 @@ public class ExamOrgReportServiceImpl implements ExamOrgReportService {
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
};
|
|
};
|
|
|
|
|
|
- Sort sort = new Sort(Direction.ASC, "id");
|
|
|
|
|
|
+ Sort sort = Sort.by(Direction.ASC, "id");
|
|
List<ExamOrgReportEntity> orgEntityList = examOrgReportRepo.findAll(specification, sort);
|
|
List<ExamOrgReportEntity> orgEntityList = examOrgReportRepo.findAll(specification, sort);
|
|
Map<Long, ExamReportMainBean> map = new LinkedHashMap<Long, ExamReportMainBean>();
|
|
Map<Long, ExamReportMainBean> map = new LinkedHashMap<Long, ExamReportMainBean>();
|
|
for (ExamOrgReportEntity e : orgEntityList) {
|
|
for (ExamOrgReportEntity e : orgEntityList) {
|