|
@@ -298,6 +298,7 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
Integer index, MultipartFile multipartFile, String md5) {
|
|
Integer index, MultipartFile multipartFile, String md5) {
|
|
BatchEntity batch = checkBatchStatus(getById(batchId));
|
|
BatchEntity batch = checkBatchStatus(getById(batchId));
|
|
try {
|
|
try {
|
|
|
|
+ studentService.resetFileAndImageCheckStatus(batch.getExamId(), batch.getSubjectCode(), examNumber);
|
|
String path = fileService.uploadSlice(multipartFile.getInputStream(), md5, batch.getExamId(), batchId,
|
|
String path = fileService.uploadSlice(multipartFile.getInputStream(), md5, batch.getExamId(), batchId,
|
|
examNumber, paperNumber, pageIndex, index);
|
|
examNumber, paperNumber, pageIndex, index);
|
|
filePropertyService.save(batch.getExamId(), path, md5, multipartFile.getSize());
|
|
filePropertyService.save(batch.getExamId(), path, md5, multipartFile.getSize());
|
|
@@ -647,8 +648,8 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
Map<Long, VerifyStudentVo> studentMap = new LinkedHashMap<>();
|
|
Map<Long, VerifyStudentVo> studentMap = new LinkedHashMap<>();
|
|
List<BatchDetailDO> list = baseMapper.batchDetailList(batch.getId());
|
|
List<BatchDetailDO> list = baseMapper.batchDetailList(batch.getId());
|
|
for (BatchDetailDO item : list) {
|
|
for (BatchDetailDO item : list) {
|
|
- //过滤非人工绑定
|
|
|
|
- if(!item.getAssigned()){
|
|
|
|
|
|
+ // 过滤非人工绑定
|
|
|
|
+ if (!item.getAssigned()) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
VerifyStudentVo student = studentMap.computeIfAbsent(item.getId(), key -> VerifyStudentVo.build(item));
|
|
VerifyStudentVo student = studentMap.computeIfAbsent(item.getId(), key -> VerifyStudentVo.build(item));
|