|
@@ -358,7 +358,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
concurrentService.getReadWriteLock(LockType.OMR_GROUP + "-" + g.getId()).readLock().lock();
|
|
concurrentService.getReadWriteLock(LockType.OMR_GROUP + "-" + g.getId()).readLock().lock();
|
|
omrTaskService.deleteByStudentIdAndGroupId(g.getId(), student.getId());
|
|
omrTaskService.deleteByStudentIdAndGroupId(g.getId(), student.getId());
|
|
// 默认分组重新生成识别对照任务,其他任务不生成
|
|
// 默认分组重新生成识别对照任务,其他任务不生成
|
|
- if(g.getFixed()){
|
|
|
|
|
|
+ if (g.getFixed()) {
|
|
omrTaskService.saveTask(g, student.getId());
|
|
omrTaskService.saveTask(g, student.getId());
|
|
}
|
|
}
|
|
concurrentService.getReadWriteLock(LockType.OMR_GROUP + "-" + g.getId()).readLock().unlock();
|
|
concurrentService.getReadWriteLock(LockType.OMR_GROUP + "-" + g.getId()).readLock().unlock();
|
|
@@ -1744,7 +1744,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
student.setExamStatus(ExamStatus.OK);
|
|
student.setExamStatus(ExamStatus.OK);
|
|
}
|
|
}
|
|
saveOrUpdate(student);
|
|
saveOrUpdate(student);
|
|
- vo.setProgress(vo.getProgress() + 1);
|
|
|
|
|
|
+ vo.setProgressCount(vo.getProgressCount() + 1);
|
|
} finally {
|
|
} finally {
|
|
concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().unlock();
|
|
concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().unlock();
|
|
}
|
|
}
|
|
@@ -1761,7 +1761,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
student.setExamStatus(ExamStatus.UNCHECK3);
|
|
student.setExamStatus(ExamStatus.UNCHECK3);
|
|
}
|
|
}
|
|
saveOrUpdate(student);
|
|
saveOrUpdate(student);
|
|
- vo.setProgress(vo.getProgress() + 1);
|
|
|
|
|
|
+ vo.setProgressCount(vo.getProgressCount() + 1);
|
|
} finally {
|
|
} finally {
|
|
concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().unlock();
|
|
concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().unlock();
|
|
}
|
|
}
|