|
@@ -218,14 +218,14 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
|
|
long endTime = now.getTimeInMillis();
|
|
long endTime = now.getTimeInMillis();
|
|
now.add(Calendar.HOUR_OF_DAY, -1);
|
|
now.add(Calendar.HOUR_OF_DAY, -1);
|
|
long startTime = now.getTimeInMillis();
|
|
long startTime = now.getTimeInMillis();
|
|
- Integer inTimeScanedCount = batchPaperService.getScanStudentCount(examId, null, startTime, endTime);
|
|
|
|
|
|
+ Integer inTimeScannedCount = batchPaperService.getScanStudentCount(examId, null, startTime, endTime);
|
|
for (SubjectScanProgressVo vo : subjects) {
|
|
for (SubjectScanProgressVo vo : subjects) {
|
|
totalCount = totalCount + vo.getStudentCount();
|
|
totalCount = totalCount + vo.getStudentCount();
|
|
vo.setScannedCount(vo.getStudentCount() - vo.getUnexistCount());
|
|
vo.setScannedCount(vo.getStudentCount() - vo.getUnexistCount());
|
|
totalScanned = totalScanned + vo.getScannedCount();
|
|
totalScanned = totalScanned + vo.getScannedCount();
|
|
vo.setProgress(Calculator.percentage(vo.getScannedCount(), vo.getStudentCount(), 2));
|
|
vo.setProgress(Calculator.percentage(vo.getScannedCount(), vo.getStudentCount(), 2));
|
|
- double speed = Calculator.divide(endTime - startTime, inTimeScanedCount, 6);
|
|
|
|
- if (inTimeScanedCount == null || inTimeScanedCount == 0) {
|
|
|
|
|
|
+ double speed = Calculator.divide(endTime - startTime, inTimeScannedCount, 6);
|
|
|
|
+ if (inTimeScannedCount == null || inTimeScannedCount == 0) {
|
|
vo.setEstimation("-");
|
|
vo.setEstimation("-");
|
|
} else {
|
|
} else {
|
|
double es = Calculator.divide(Calculator.multiply(speed, vo.getUnexistCount()), 3600000, 2);
|
|
double es = Calculator.divide(Calculator.multiply(speed, vo.getUnexistCount()), 3600000, 2);
|