|
@@ -54,17 +54,19 @@ public class ImageCheckServiceImpl implements ImageCheckService {
|
|
|
vo.setSubjectCode(subject.getCode());
|
|
|
vo.setSubjectName(subject.getName());
|
|
|
vo.setTotalCount(studentService.countByExamIdAndSubjectCode(examId,subject.getCode()));
|
|
|
- List<ImageCheckStatus> imageCheckStatusList = new ArrayList<>();
|
|
|
- List<UploadStatus> fileUploadStatusList = new ArrayList<>();
|
|
|
- vo.setFailedCount(studentService.getImageCheckFailedCount(examId,subject.getCode()));
|
|
|
- vo.setDisposedCount(studentService.getImageCheckDisposedCount(examId,subject.getCode()));
|
|
|
- if (vo.getTotalCount() == null || vo.getTotalCount() == 0) {
|
|
|
- vo.setImageCheckProgress(null);
|
|
|
- } else {
|
|
|
- double progress = MathUtil.percentage(vo.getTotalCount() - vo.getDisposedCount(), vo.getTotalCount());
|
|
|
- vo.setImageCheckProgress(progress);
|
|
|
+ if(vo.getTotalCount()!=null && vo.getTotalCount()>0){
|
|
|
+ List<ImageCheckStatus> imageCheckStatusList = new ArrayList<>();
|
|
|
+ List<UploadStatus> fileUploadStatusList = new ArrayList<>();
|
|
|
+ vo.setFailedCount(studentService.getImageCheckFailedCount(examId,subject.getCode()));
|
|
|
+ vo.setDisposedCount(studentService.getImageCheckDisposedCount(examId,subject.getCode()));
|
|
|
+ if (vo.getTotalCount() == null || vo.getTotalCount() == 0) {
|
|
|
+ vo.setImageCheckProgress(null);
|
|
|
+ } else {
|
|
|
+ double progress = MathUtil.percentage(vo.getTotalCount() - vo.getDisposedCount(), vo.getTotalCount());
|
|
|
+ vo.setImageCheckProgress(progress);
|
|
|
+ }
|
|
|
+ result.add(vo);
|
|
|
}
|
|
|
- result.add(vo);
|
|
|
}
|
|
|
|
|
|
return result;
|