yin 9 months ago
parent
commit
fe5b23f00d

+ 3 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkController.java

@@ -258,7 +258,9 @@ public class MarkController extends BaseExamController {
                 }
                 }
                 try {
                 try {
                     lockService.waitlock(LockType.GROUP, group.getExamId(), group.getSubjectCode(), group.getNumber());
                     lockService.waitlock(LockType.GROUP, group.getExamId(), group.getSubjectCode(), group.getNumber());
-                    if (group.getStatus() == MarkStatus.FORMAL && group.getLeftCount() == 0) {
+                    if (group.getStatus() == MarkStatus.FORMAL && group.getLeftCount() == 0
+                            && selectiveStudentDao.countByExamIdAndSubjectCodeAndLessSelectiveOrNotSelective(
+                            group.getExamId(), group.getSubjectCode(), true, true) == 0) {
                         groupService.updateStatus(examId, code, group.getNumber(), MarkStatus.FINISH,
                         groupService.updateStatus(examId, code, group.getNumber(), MarkStatus.FINISH,
                                 group.getStatus());
                                 group.getStatus());
                     }else{
                     }else{