|
@@ -3,11 +3,6 @@ package cn.com.qmth.scancentral.service.impl;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
-import cn.com.qmth.scancentral.entity.SubjectEntity;
|
|
|
|
-import cn.com.qmth.scancentral.enums.ImageCheckStatus;
|
|
|
|
-import cn.com.qmth.scancentral.enums.UploadStatus;
|
|
|
|
-import cn.com.qmth.scancentral.service.StudentService;
|
|
|
|
-import cn.com.qmth.scancentral.service.SubjectService;
|
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
@@ -20,7 +15,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.qmth.boot.core.collection.PageResult;
|
|
import com.qmth.boot.core.collection.PageResult;
|
|
|
|
|
|
import cn.com.qmth.scancentral.dao.StudentDao;
|
|
import cn.com.qmth.scancentral.dao.StudentDao;
|
|
|
|
+import cn.com.qmth.scancentral.entity.SubjectEntity;
|
|
import cn.com.qmth.scancentral.service.ImageCheckService;
|
|
import cn.com.qmth.scancentral.service.ImageCheckService;
|
|
|
|
+import cn.com.qmth.scancentral.service.StudentService;
|
|
|
|
+import cn.com.qmth.scancentral.service.SubjectService;
|
|
import cn.com.qmth.scancentral.service.ToolExportService;
|
|
import cn.com.qmth.scancentral.service.ToolExportService;
|
|
import cn.com.qmth.scancentral.util.MathUtil;
|
|
import cn.com.qmth.scancentral.util.MathUtil;
|
|
import cn.com.qmth.scancentral.util.PageUtil;
|
|
import cn.com.qmth.scancentral.util.PageUtil;
|
|
@@ -35,29 +33,31 @@ public class ImageCheckServiceImpl implements ImageCheckService {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ToolExportService toolExportService;
|
|
private ToolExportService toolExportService;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private StudentDao studentDao;
|
|
private StudentDao studentDao;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private SubjectService subjectService;
|
|
private SubjectService subjectService;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private StudentService studentService;
|
|
private StudentService studentService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public List<ImageCheckVo> list(Long examId) {
|
|
public List<ImageCheckVo> list(Long examId) {
|
|
if (examId == null) {
|
|
if (examId == null) {
|
|
throw new IllegalArgumentException("考试ID不能为空");
|
|
throw new IllegalArgumentException("考试ID不能为空");
|
|
}
|
|
}
|
|
- List<SubjectEntity> subjectList =subjectService.listByExamId(examId);
|
|
|
|
-// List<ImageCheckVo> result = studentDao.countImageCheck(examId);
|
|
|
|
|
|
+ List<SubjectEntity> subjectList = subjectService.listByExamId(examId);
|
|
|
|
+ // List<ImageCheckVo> result = studentDao.countImageCheck(examId);
|
|
List<ImageCheckVo> result = new ArrayList<>();
|
|
List<ImageCheckVo> result = new ArrayList<>();
|
|
- for (SubjectEntity subject: subjectList) {
|
|
|
|
- ImageCheckVo vo =new ImageCheckVo();
|
|
|
|
|
|
+ for (SubjectEntity subject : subjectList) {
|
|
|
|
+ ImageCheckVo vo = new ImageCheckVo();
|
|
vo.setSubjectCode(subject.getCode());
|
|
vo.setSubjectCode(subject.getCode());
|
|
vo.setSubjectName(subject.getName());
|
|
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()));
|
|
|
|
|
|
+ vo.setTotalCount(studentService.countByExamIdAndSubjectCode(examId, subject.getCode()));
|
|
|
|
+ vo.setFailedCount(studentService.getImageCheckFailedCount(examId, subject.getCode()));
|
|
|
|
+ vo.setDisposedCount(studentService.getImageCheckDisposedCount(examId, subject.getCode()));
|
|
if (vo.getTotalCount() == null || vo.getTotalCount() == 0) {
|
|
if (vo.getTotalCount() == null || vo.getTotalCount() == 0) {
|
|
vo.setImageCheckProgress(null);
|
|
vo.setImageCheckProgress(null);
|
|
} else {
|
|
} else {
|