|
@@ -244,19 +244,14 @@ public class ScanController extends BaseExamController {
|
|
List<String> result = studentService.findDistinctExamSite(examId);
|
|
List<String> result = studentService.findDistinctExamSite(examId);
|
|
result = result.stream().filter(s -> StringUtils.isNotBlank(s)).collect(Collectors.toList());
|
|
result = result.stream().filter(s -> StringUtils.isNotBlank(s)).collect(Collectors.toList());
|
|
if (StringUtils.isBlank(query.getExamSite())) {
|
|
if (StringUtils.isBlank(query.getExamSite())) {
|
|
- List<?> examSiteList = PageUtil.startPage(result, query.getPageNumber(), query.getPageSize());
|
|
|
|
- for (Object e : examSiteList) {
|
|
|
|
|
|
+ for (String examSite : result) {
|
|
ScanInfoVO vo = new ScanInfoVO();
|
|
ScanInfoVO vo = new ScanInfoVO();
|
|
- String examSite = (String) e;
|
|
|
|
vo.setName(examSite);
|
|
vo.setName(examSite);
|
|
vo.setTotalCount(studentService.countByExamIdAndExamSite(examId, examSite));
|
|
vo.setTotalCount(studentService.countByExamIdAndExamSite(examId, examSite));
|
|
vo.setScanCount(studentService.countByExamIdAndExamSite(examId, examSite, true));
|
|
vo.setScanCount(studentService.countByExamIdAndExamSite(examId, examSite, true));
|
|
vo.setScanSheetCount(studentService.countSheetCountByExamIdAndExamSite(examId, examSite) / 2);
|
|
vo.setScanSheetCount(studentService.countSheetCountByExamIdAndExamSite(examId, examSite) / 2);
|
|
list.add(vo);
|
|
list.add(vo);
|
|
}
|
|
}
|
|
- query.setTotalCount(result.size());
|
|
|
|
- query.setTotalPage(PageUtil.pageCount(result, query.getPageNumber(), query.getPageSize()));
|
|
|
|
- query.setCurrentCount(examSiteList.size());
|
|
|
|
} else {
|
|
} else {
|
|
ScanInfoVO vo = new ScanInfoVO();
|
|
ScanInfoVO vo = new ScanInfoVO();
|
|
vo.setName(query.getExamSite());
|
|
vo.setName(query.getExamSite());
|