fixbugs

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

@@ -23,7 +23,6 @@ import com.qmth.boot.core.concurrent.service.ConcurrentService;
 import com.qmth.boot.core.exception.ParameterException;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.entity.SysConfig;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -156,11 +155,13 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
                 // 分组类型
                 // 识别嫌疑
                 if (ConditionType.FILL_SUSPECT.equals(c)) {
-                    List<MarkQuestion> questionList = markQuestionService.listByExamIdAndPaperNumberAndPaperIndexAndPageIndex(paper.getExamId(),student.getPaperNumber(),spe.getPaperIndex(), pageEntity.getPageIndex(),true);
+                    List<ScanAnswerCardQuestion> questionList = scanAnswerCardQuestionService
+                            .listByExamIdAndPaperNumberAndCardNumberAndPaperIndexAndPageIndex(student.getExamId(),
+                                    student.getPaperNumber(), student.getCardNumber(), spe.getPaperIndex(), pageEntity.getPageIndex());
                     for (int i = 0; pageEntity.getQuestion() != null && pageEntity.getQuestion().getResult() != null
                             && i < pageEntity.getQuestion().getResult().size(); i++) {
                         String result = pageEntity.getQuestion().getResult().get(i);
-                        MarkQuestion question = questionList.get(i);
+                        ScanAnswerCardQuestion question = questionList.get(i);
                         //单选题若开启配置，仅有一个选项的不参与识别对照
                         String answer = result.replace("?","");
                         if (question.getQuestionType().equals(QuestionType.SINGLE.getValue()) && enableObjectiveOmr && answer.length()==1){