3.4.5 20250610 bug修复

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkPaperServiceImpl.java

@@ -257,8 +257,7 @@ public class MarkPaperServiceImpl extends ServiceImpl<MarkPaperMapper, MarkPaper
                         continue;
                     }
                     // 未缺考、未违纪且已上传图片的考生全部评完
-                    else if (markStudentService.countByExamIdAndPaperNumberAndMarkStatus(examId, paperNumber, SubjectiveStatus.UNMARK) > 0
-                            || markStudentService.countUnmarkByExamIdAndPaperNumber(examId, paperNumber) > 0) {
+                    else if (markStudentService.countByExamIdAndPaperNumberAndMarkStatus(examId, paperNumber, SubjectiveStatus.UNMARK) > 0) {
                         stringJoiner.add(courseInfo + "考生正在统分中，无法结束评卷");
                         continue;
                     }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java

@@ -583,7 +583,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
 
         Long examId = student.getExamId();
         String paperNumber = student.getPaperNumber();
-        AbInfoVo abInfoVo = this.findExamTaskPaperTypeOpenStatus(examId, paperNumber);
+//        AbInfoVo abInfoVo = this.findExamTaskPaperTypeOpenStatus(examId, paperNumber);
 
         // 重置状态
         student.setIncomplete(false);
@@ -648,7 +648,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                 // 根据卷型识别结果更新考生卷型，如果卷型识别结果异常则添加到卷型检查中
                 StringResult paperTypeResult = page.getPaperType();
 
-                if (abInfoVo != null && abInfoVo.getOpenAb() && PaperTypeEnum.FILL.equals(abInfoVo.getPaperTypeStyle())) {
+                if (paperTypeResult != null) {
 //                    if (Objects.isNull(paperTypeResult)) {
 //                        // 卷型为空 (正常不会出现这种情况)
 //                        throw ExceptionResultEnum.ERROR.exception("开启卷型的试卷未检测到识别的卷型");

teachcloud-mark/src/main/resources/mapper/MarkStudentMapper.xml

@@ -1145,7 +1145,7 @@
             (SELECT
                  mt.student_id,
                  SUM(CASE
-                         WHEN status = 'MARKED' THEN 0
+                         WHEN status in ('MARKED', 'ARBITRATED')  THEN 0
                          ELSE 1
                      END) aa
              FROM