|
@@ -423,13 +423,13 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
|
for (Map.Entry<Long, List<StudentPaperEntity>> entry : studentMap.entrySet()) {
|
|
|
concurrentService.getReadWriteLock(LockType.STUDENT + "-" + entry.getKey()).writeLock().lock();
|
|
|
try {
|
|
|
- studentService.updateStudentAndPaper(user, entry.getKey(), entry.getValue());
|
|
|
+
|
|
|
StudentEntity student = studentService.getById(entry.getKey());
|
|
|
- if(student.getAssigned()){
|
|
|
+
|
|
|
assignedCheckHistoryService.deleteByStudentIdAndUserRole(user.getId(),Role.AUDITOR);
|
|
|
assignedCheckHistoryService.save(user.getId(), entry.getKey(), examId);
|
|
|
studentService.updateAssignedCheckCount(entry.getKey(), false);
|
|
|
- }
|
|
|
+
|
|
|
} finally {
|
|
|
concurrentService.getReadWriteLock(LockType.STUDENT + "-" + entry.getKey()).writeLock().unlock();
|
|
|
}
|
|
@@ -447,8 +447,8 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
|
throw new ParameterException("批次已被处理");
|
|
|
}
|
|
|
if (comfirm) {
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+ updateBatchAssignedStudentData(user, batchId, entity.getExamId());
|
|
|
entity.setVerifyStatus(VerifyStatus.CONFIRM);
|
|
|
} else {
|
|
|
entity.setVerifyStatus(VerifyStatus.REJECT);
|
|
@@ -1071,6 +1071,7 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
|
String campusCode = null;
|
|
|
String examSite = null;
|
|
|
String examRoom = null ;
|
|
|
+ boolean updateAssignedCount = !VerifyStatus.CONFIRM.equals(batch.getVerifyStatus());
|
|
|
for (StudentEntity student:studentMap.values()) {
|
|
|
province = student.getProvince();
|
|
|
campusCode = student.getCampusCode();
|
|
@@ -1085,7 +1086,7 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
|
|
|
|
studentPaperService.saveOrUpdateBatchByMultiId(studentPaperList);
|
|
|
|
|
|
- student = studentService.updateStudentByPaper(user, student.getId(), false,true);
|
|
|
+ student = studentService.updateStudentByPaper(user, student.getId(), false,updateAssignedCount);
|
|
|
if(student.getAssigned()){
|
|
|
assignedCount++;
|
|
|
}
|