|
@@ -217,8 +217,8 @@ public class ScanController extends BaseExamController {
|
|
|
} else {
|
|
|
ScanInfoVO vo = new ScanInfoVO();
|
|
|
vo.setName(query.getExamSite());
|
|
|
- vo.setTotalCount(studentService.countByExamIdAndExamSite(examId, query.getCampusName()));
|
|
|
- vo.setScanCount(studentService.countByExamIdAndExamSite(examId, query.getCampusName(), true));
|
|
|
+ vo.setTotalCount(studentService.countByExamIdAndExamSite(examId, query.getExamSite()));
|
|
|
+ vo.setScanCount(studentService.countByExamIdAndExamSite(examId, query.getExamSite(), true));
|
|
|
vo.setScanSheetCount(studentService.countSheetCountByExamIdAndExamSite(examId, query.getExamSite()) / 2);
|
|
|
list.add(vo);
|
|
|
|
|
@@ -257,6 +257,13 @@ public class ScanController extends BaseExamController {
|
|
|
query.setTotalCount(result.size());
|
|
|
query.setTotalPage(PageUtil.pageCount(result, query.getPageNumber(), query.getPageSize()));
|
|
|
query.setCurrentCount(examSiteList.size());
|
|
|
+ } else {
|
|
|
+ ScanInfoVO vo = new ScanInfoVO();
|
|
|
+ vo.setName(query.getExamSite());
|
|
|
+ vo.setTotalCount(studentService.countByExamIdAndExamSite(examId, query.getExamSite()));
|
|
|
+ vo.setScanCount(studentService.countByExamIdAndExamSite(examId, query.getExamSite(), true));
|
|
|
+ vo.setScanSheetCount(studentService.countSheetCountByExamIdAndExamSite(examId, query.getExamSite()) / 2);
|
|
|
+ list.add(vo);
|
|
|
}
|
|
|
try {
|
|
|
String fileName = "扫描进度.xlsx";
|