theluyuan/xzs-mysql
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
alvis 2020-06-28 16:05:50 +08:00
parent 90d1442b5e
commit 452966dd53
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/exam/src/main/java/com/alvis/exam/service/impl/ExamPaperAnswerServiceImpl.java
View File

@ -130,7 +130,7 @@ public class ExamPaperAnswerServiceImpl extends BaseServiceImpl<ExamPaperAnswer>
TextContent textContent = textContentService.selectById(taskExamCustomerAnswer.getTextContentId()); TextContent textContent = textContentService.selectById(taskExamCustomerAnswer.getTextContentId());
List<TaskItemAnswerObject> taskItemAnswerObjects = JsonUtil.toJsonListObject(textContent.getContent(), TaskItemAnswerObject.class); List<TaskItemAnswerObject> taskItemAnswerObjects = JsonUtil.toJsonListObject(textContent.getContent(), TaskItemAnswerObject.class);
taskItemAnswerObjects.stream() taskItemAnswerObjects.stream()
.filter(d -> d.getExamPaperAnswerId() == examPaperAnswer.getId()) .filter(d -> d.getExamPaperAnswerId().equals(examPaperAnswer.getId()))
.findFirst().ifPresent(taskItemAnswerObject -> taskItemAnswerObject.setStatus(examPaperAnswer.getStatus())); .findFirst().ifPresent(taskItemAnswerObject -> taskItemAnswerObject.setStatus(examPaperAnswer.getStatus()));
textContentService.jsonConvertUpdate(textContent, taskItemAnswerObjects, null); textContentService.jsonConvertUpdate(textContent, taskItemAnswerObjects, null);
textContentService.updateByIdFilter(textContent); textContentService.updateByIdFilter(textContent);
@ -176,12 +176,13 @@ public class ExamPaperAnswerServiceImpl extends BaseServiceImpl<ExamPaperAnswer>
/** /**
* 用户提交答案的转化存储对象 * 用户提交答案的转化存储对象
* @param question question *
* @param question question
* @param customerQuestionAnswer customerQuestionAnswer * @param customerQuestionAnswer customerQuestionAnswer
* @param examPaper examPaper * @param examPaper examPaper
* @param itemOrder itemOrder * @param itemOrder itemOrder
* @param user user * @param user user
* @param now now * @param now now
* @return ExamPaperQuestionCustomerAnswer * @return ExamPaperQuestionCustomerAnswer
*/ */
private ExamPaperQuestionCustomerAnswer ExamPaperQuestionCustomerAnswerFromVM(Question question, ExamPaperSubmitItemVM customerQuestionAnswer, ExamPaper examPaper, Integer itemOrder, User user, Date now) { private ExamPaperQuestionCustomerAnswer ExamPaperQuestionCustomerAnswerFromVM(Question question, ExamPaperSubmitItemVM customerQuestionAnswer, ExamPaper examPaper, Integer itemOrder, User user, Date now) {
@ -205,9 +206,10 @@ public class ExamPaperAnswerServiceImpl extends BaseServiceImpl<ExamPaperAnswer>
/** /**
* 判断提交答案是否正确，保留用户提交的答案 * 判断提交答案是否正确，保留用户提交的答案
*
* @param examPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer * @param examPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer
* @param question question * @param question question
* @param customerQuestionAnswer customerQuestionAnswer * @param customerQuestionAnswer customerQuestionAnswer
*/ */
private void setSpecialFromVM(ExamPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer, Question question, ExamPaperSubmitItemVM customerQuestionAnswer) { private void setSpecialFromVM(ExamPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer, Question question, ExamPaperSubmitItemVM customerQuestionAnswer) {
QuestionTypeEnum questionTypeEnum = QuestionTypeEnum.fromCode(examPaperQuestionCustomerAnswer.getQuestionType()); QuestionTypeEnum questionTypeEnum = QuestionTypeEnum.fromCode(examPaperQuestionCustomerAnswer.getQuestionType());