Browse Source

bug修复

master
luogw 2 months ago
parent
commit
b691b39325
  1. 3
      src/main/java/com/project/exam/domain/dto/ExamRecordDTO.java
  2. 3
      src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java
  3. 2
      src/main/java/com/project/interaction/domain/service/impl/GenerateQuestionQueueServiceImpl.java

3
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

3
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 {

2
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);

Loading…
Cancel
Save