From b691b393254b9c6d1a3d78e2ef12556943749eeb Mon Sep 17 00:00:00 2001
From: luogw <3132758203@qq.com>
Date: Tue, 14 Jul 2026 17:50:47 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/project/exam/domain/dto/ExamRecordDTO.java  | 3 +++
 .../service/impl/AdminSearchExamRecordDomainServiceImpl.java  | 3 ++-
 .../domain/service/impl/GenerateQuestionQueueServiceImpl.java | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/project/exam/domain/dto/ExamRecordDTO.java b/src/main/java/com/project/exam/domain/dto/ExamRecordDTO.java
index d6a449f..aced62e 100644
--- a/src/main/java/com/project/exam/domain/dto/ExamRecordDTO.java
+++ b/src/main/java/com/project/exam/domain/dto/ExamRecordDTO.java
@@ -46,6 +46,9 @@ public class ExamRecordDTO extends BaseDTO {
 
     private Integer serialNumber;
 
+    // V1.1 新增：简答题评分状态（0=待评分，1=已完成，2=失败）
+    private Integer scoringStatus;
+
     private List<ExamRecordPictureDTO> pictureDTOList = new ArrayList<>();
 
     @Data
diff --git a/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java b/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java
index 7391f97..cb76d7d 100644
--- a/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java
+++ b/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java
@@ -13,6 +13,7 @@ import com.project.exam.domain.dto.ExamRecordPictureDTO;
 import com.project.exam.domain.entity.ExamRecordEntity;
 import com.project.exam.domain.entity.ExamRecordPictureEntity;
 import com.project.exam.domain.enums.ExamRecordPassTextEnum;
+import com.project.exam.domain.enums.ExamRecordScoringStatusEnum;
 import com.project.exam.domain.param.ExamRecordParam;
 import com.project.exam.domain.service.AdminSearchExamRecordDomainService;
 import com.project.exam.domain.service.ExamRecordBaseService;
@@ -127,7 +128,7 @@ public class AdminSearchExamRecordDomainServiceImpl implements AdminSearchExamRe
                 dto.setSubLineName(productLine.getName());
             }
         }
-        if (BooleanUtil.isTrue(dto.getPass())) {
+        if (BooleanUtil.isTrue(dto.getPass()) && ExamRecordScoringStatusEnum.COMPLETED.getValue().equals(dto.getScoringStatus())) {
             dto.setPassText(ExamRecordPassTextEnum.Pass.getValue());
             dto.setPassHtml(ExamRecordPassTextEnum.Pass.getHtml());
         } else {
diff --git a/src/main/java/com/project/interaction/domain/service/impl/GenerateQuestionQueueServiceImpl.java b/src/main/java/com/project/interaction/domain/service/impl/GenerateQuestionQueueServiceImpl.java
index edf954a..8070565 100644
--- a/src/main/java/com/project/interaction/domain/service/impl/GenerateQuestionQueueServiceImpl.java
+++ b/src/main/java/com/project/interaction/domain/service/impl/GenerateQuestionQueueServiceImpl.java
@@ -81,7 +81,7 @@ public class GenerateQuestionQueueServiceImpl implements GenerateQuestionQueueSe
 
                 GenerateQuestionQueueDTO latestItem = itemMap.get(item.getItemId());
                 if (latestItem == null) {
-                    currentSize.decrementAndGet();
+                    // queue 中残留项（已被 removeItem/removeByTaskId 移除），直接丢弃
                     continue;
                 }
                 retryItems.add(latestItem);
@@ -154,4 +154,4 @@ public class GenerateQuestionQueueServiceImpl implements GenerateQuestionQueueSe
             capacityLock.unlock();
         }
     }
-}
\ No newline at end of file
+}