Ver código fonte

3.4.5 update-20250423,bug修改

xiaofei 2 meses atrás
pai
commit
fe421548bf

+ 20 - 16
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/TaskServiceImpl.java

@@ -398,25 +398,29 @@ public class TaskServiceImpl implements TaskService {
         markTaskTrackDto.setTrackList(markTask.listMarkerTrack());
         markTaskTrackDto.setHeaderTrackList(markTask.listHeaderTrack());
         MarkTaskTrackOcrDto markTaskTrackOcrDto = new MarkTaskTrackOcrDto();
-        if (StringUtils.isNotBlank(markTask.getAiMarkErrorMsg())) {
-            markTaskTrackOcrDto.setErrorMsg(markTask.getAiMarkErrorMsg());
-        } else {
-            List<MarkOcrStudentQuestion> markOcrStudentQuestions = markOcrStudentQuestionService.listByStudentIdAndQuestionId(markTask.getStudentId(), markTask.getQuestionId());
-            List<String> result = new ArrayList<>();
-            if (CollectionUtils.isNotEmpty(markOcrStudentQuestions)) {
-                result = markOcrStudentQuestions.stream().map(MarkOcrStudentQuestion::getOcrContent).collect(Collectors.toList());
+
+        // AI评卷任务,显示OCR信息
+        if (markTask.getAiMarked()) {
+            if (StringUtils.isNotBlank(markTask.getAiMarkErrorMsg())) {
+                markTaskTrackOcrDto.setErrorMsg(markTask.getAiMarkErrorMsg());
+            } else {
+                List<MarkOcrStudentQuestion> markOcrStudentQuestions = markOcrStudentQuestionService.listByStudentIdAndQuestionId(markTask.getStudentId(), markTask.getQuestionId());
+                List<String> result = new ArrayList<>();
+                if (CollectionUtils.isNotEmpty(markOcrStudentQuestions)) {
+                    result = markOcrStudentQuestions.stream().map(MarkOcrStudentQuestion::getOcrContent).collect(Collectors.toList());
+                }
+                markTaskTrackOcrDto.setResult(result);
             }
-            markTaskTrackOcrDto.setResult(result);
-        }
-        markTaskTrackDto.setOcr(markTaskTrackOcrDto);
+            markTaskTrackDto.setOcr(markTaskTrackOcrDto);
 
-        MarkAiQuestionParam markAiQuestionParam = markAiQuestionParamService.getByExamIdAndPaperNumberAndQuestionId(markTask.getExamId(), markTask.getPaperNumber(), markTask.getQuestionId());
-        if (Objects.nonNull(markAiQuestionParam)) {
-            List<MarkAiQuestionPoint> markAiQuestionPointDbList = markAiQuestionPointService.listByAiQuestionId(markAiQuestionParam.getId());
-            List<MarkAiQuestionLevel> markAiQuestionLevelDbList = markAiQuestionLevelService.listByAiQuestionId(markAiQuestionParam.getId());
-            markAiQuestionParam.setListInfo(markAiQuestionPointDbList, markAiQuestionLevelDbList);
+            MarkAiQuestionParam markAiQuestionParam = markAiQuestionParamService.getByExamIdAndPaperNumberAndQuestionId(markTask.getExamId(), markTask.getPaperNumber(), markTask.getQuestionId());
+            if (Objects.nonNull(markAiQuestionParam)) {
+                List<MarkAiQuestionPoint> markAiQuestionPointDbList = markAiQuestionPointService.listByAiQuestionId(markAiQuestionParam.getId());
+                List<MarkAiQuestionLevel> markAiQuestionLevelDbList = markAiQuestionLevelService.listByAiQuestionId(markAiQuestionParam.getId());
+                markAiQuestionParam.setListInfo(markAiQuestionPointDbList, markAiQuestionLevelDbList);
+            }
+            markTaskTrackDto.setMarkAiQuestionParam(markAiQuestionParam);
         }
-        markTaskTrackDto.setMarkAiQuestionParam(markAiQuestionParam);
         return markTaskTrackDto;
     }