fix

src/main/java/cn/com/qmth/scancentral/service/impl/SubjectServiceImpl.java

@@ -208,25 +208,26 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
     @Override
     public ScanProgressVo scanProgress(Long examId, String subjectCode) {
         ScanProgressVo ret = new ScanProgressVo();
-//        List<SubjectScanProgressVo> subjects = studentService.scanProgress(examId, subjectCode);
+        // List<SubjectScanProgressVo> subjects =
+        // studentService.scanProgress(examId, subjectCode);
 
         List<SubjectScanProgressVo> subjects = new ArrayList<>();
-        if(StringUtils.isNotBlank(subjectCode)){
-            SubjectEntity subject = this.findByExamIdAndCode(examId,subjectCode);
+        if (StringUtils.isNotBlank(subjectCode)) {
+            SubjectEntity subject = this.findByExamIdAndCode(examId, subjectCode);
             SubjectScanProgressVo vo = new SubjectScanProgressVo();
             vo.setSubjectCode(subject.getCode());
             vo.setSubjectName(subject.getName());
-            vo.setUnexistCount(studentService.getUnscannedCountByExamAndSubject(examId,subject.getCode()));
-            vo.setStudentCount(studentService.countByExamIdAndSubjectCode(examId,subject.getCode()));
+            vo.setUnexistCount(studentService.getUnscannedCountByExamAndSubject(examId, subject.getCode()));
+            vo.setStudentCount(studentService.countByExamIdAndSubjectCode(examId, subject.getCode()));
             subjects.add(vo);
-        }else{
-            List<SubjectEntity> subjectList =this.listByExamId(examId);
-            for (SubjectEntity subject:subjectList) {
+        } else {
+            List<SubjectEntity> subjectList = this.listByExamId(examId);
+            for (SubjectEntity subject : subjectList) {
                 SubjectScanProgressVo vo = new SubjectScanProgressVo();
                 vo.setSubjectCode(subject.getCode());
                 vo.setSubjectName(subject.getName());
-                vo.setUnexistCount(studentService.getUnscannedCountByExamAndSubject(examId,subject.getCode()));
-                vo.setStudentCount(studentService.countByExamIdAndSubjectCode(examId,subject.getCode()));
+                vo.setUnexistCount(studentService.getUnscannedCountByExamAndSubject(examId, subject.getCode()));
+                vo.setStudentCount(studentService.countByExamIdAndSubjectCode(examId, subject.getCode()));
                 subjects.add(vo);
             }
         }
@@ -256,11 +257,11 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
         ret.getTotal().setUnexistCount(ret.getTotal().getStudentCount() - ret.getTotal().getScannedCount());
         ret.getTotal().setProgress(
                 Calculator.percentage(ret.getTotal().getScannedCount(), ret.getTotal().getStudentCount(), 2));
-        if (ret.getTotal().getStudentCount() == 0) {
+        if (inTimeScannedCount == null || inTimeScannedCount == 0) {
             ret.getTotal().setEstimation("-");
         } else {
             double speed = Calculator.divide(endTime - startTime, inTimeScannedCount, 6);
-            double es = Calculator.divide(Calculator.multiply(speed,   ret.getTotal().getUnexistCount()), 3600000, 2);
+            double es = Calculator.divide(Calculator.multiply(speed, ret.getTotal().getUnexistCount()), 3600000, 2);
             ret.getTotal().setEstimation(es + "h");
         }
         return ret;