From 7fd0771bbebafa36bc007ceb581cdaab4d290c82 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 09:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java b/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java
index 8d42033..0a56336 100644
--- a/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java
+++ b/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java
@@ -1,6 +1,10 @@
package com.ycl.jxkg.listener;
import com.ycl.jxkg.domain.*;
+import com.ycl.jxkg.domain.entity.ExamPaper;
+import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
+import com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer;
+import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.enums.ExamPaperTypeEnum;
import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
import com.ycl.jxkg.event.CalculateExamPaperAnswerCompleteEvent;
@@ -57,10 +61,12 @@
ExamPaperAnswer examPaperAnswer = examPaperAnswerInfo.getExamPaperAnswer();
List<ExamPaperQuestionCustomerAnswer> examPaperQuestionCustomerAnswers = examPaperAnswerInfo.getExamPaperQuestionCustomerAnswers();
- examPaperAnswerService.insertByFilter(examPaperAnswer);
+ examPaperAnswerService.save(examPaperAnswer);
examPaperQuestionCustomerAnswers.stream().filter(a -> QuestionTypeEnum.needSaveTextContent(a.getQuestionType())).forEach(d -> {
- TextContent textContent = new TextContent(d.getAnswer(), now);
- textContentService.insertByFilter(textContent);
+ TextContent textContent = new TextContent();
+ textContent.setContent(d.getAnswer());
+ textContent.setCreateTime(now);
+ textContentService.save(textContent);
d.setTextContentId(textContent.getId());
d.setAnswer(null);
});
@@ -70,7 +76,7 @@
examPaperQuestionCustomerAnswerService.insertList(examPaperQuestionCustomerAnswers);
switch (ExamPaperTypeEnum.fromCode(examPaper.getPaperType())) {
- case Task: {
+ case RandomOrder: {
examCustomerAnswerService.insertOrUpdate(examPaper, examPaperAnswer, now);
break;
}
--
Gitblit v1.8.0