|
@@ -85,6 +85,7 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private AssignedCheckHistoryService assignedCheckHistoryService;
|
|
private AssignedCheckHistoryService assignedCheckHistoryService;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private ScannerService scannerService;
|
|
private ScannerService scannerService;
|
|
|
|
|
|
@@ -313,7 +314,6 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
paper.setNumber(paperNumber);
|
|
paper.setNumber(paperNumber);
|
|
paper.setMismatch(false);
|
|
paper.setMismatch(false);
|
|
paper.setQuestionFilled(false);
|
|
paper.setQuestionFilled(false);
|
|
- paper.setAssignedSuspect(false);
|
|
|
|
paper.setSubjectiveFilled(answerPaper.getSubjectiveFilled());
|
|
paper.setSubjectiveFilled(answerPaper.getSubjectiveFilled());
|
|
paper.setOmrExamNumber(answerPaper.getOmrExamNumber());
|
|
paper.setOmrExamNumber(answerPaper.getOmrExamNumber());
|
|
paper.setAssigned(answerPaper.getAssigned());
|
|
paper.setAssigned(answerPaper.getAssigned());
|
|
@@ -673,7 +673,8 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
int retry = 1;
|
|
int retry = 1;
|
|
VerifyTaskVo task = null;
|
|
VerifyTaskVo task = null;
|
|
while (task == null) {
|
|
while (task == null) {
|
|
- List<BatchEntity> list = this.findUnCheck(examId, retry, 20, BatchStatus.FINISH, CheckStatus.WAITING,exam.getImageCheckOrder())
|
|
|
|
|
|
+ List<BatchEntity> list = this
|
|
|
|
+ .findUnCheck(examId, retry, 20, BatchStatus.FINISH, CheckStatus.WAITING, exam.getImageCheckOrder())
|
|
.getRecords();
|
|
.getRecords();
|
|
if (list.isEmpty()) {
|
|
if (list.isEmpty()) {
|
|
break;
|
|
break;
|
|
@@ -780,8 +781,8 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public IPage<BatchEntity> findUnCheck(Long examId, int pageNumber, int pageSize, BatchStatus batchStatus,
|
|
public IPage<BatchEntity> findUnCheck(Long examId, int pageNumber, int pageSize, BatchStatus batchStatus,
|
|
- CheckStatus checkStatus,String order) {
|
|
|
|
- return this.baseMapper.findUnCheck(new Page<>(pageNumber, pageSize), examId, batchStatus, checkStatus,order);
|
|
|
|
|
|
+ CheckStatus checkStatus, String order) {
|
|
|
|
+ return this.baseMapper.findUnCheck(new Page<>(pageNumber, pageSize), examId, batchStatus, checkStatus, order);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|