From cfc61445380851d621f4dd853fe62941f9c80207 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 09 五月 2024 15:30:52 +0800 Subject: [PATCH] 部门管理员优化 --- src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java index 7186bd1..2f54f3a 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java +++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java @@ -519,14 +519,14 @@ Map<Integer, Integer> multiple = new HashMap<>(); //澶氶�� Map<Integer, Integer> multipleMap = list.stream() - .filter(e -> e.getQuestionType().equals(QuestionTypeEnum.MultipleChoice.getCode())) + .filter(e -> Objects.equals(QuestionTypeEnum.MultipleChoice.getCode(), e.getQuestionType())) .collect(Collectors.toMap(Question::getId, Question::getScore)); Integer multipleSource = questionTypeVM.getMultipleChoice() * 2; selectRandomScores(multiple, multipleMap, questionTypeVM.getMultipleChoice(), multipleSource); //鍒ゆ柇 - List<Question> collect1 = list.stream().filter(e -> e.getQuestionType().equals(QuestionTypeEnum.TrueFalse.getCode())).collect(Collectors.toList()); + List<Question> collect1 = list.stream().filter(e -> Objects.equals(e.getQuestionType(), QuestionTypeEnum.TrueFalse.getCode())).collect(Collectors.toList()); Map<Integer, Integer> judgmentMap = collect1.stream().collect(Collectors.toMap(Question::getId, Question::getScore)); Integer trueFalse1 = questionTypeVM.getTrueFalse(); Integer trueFalse = trueFalse1 * 2; @@ -536,7 +536,7 @@ Integer radioSource = questionTypeVM.getSingleChoice() * 4; //鍗曢�� Map<Integer, Integer> radioMap = list.stream() - .filter(e -> e.getQuestionType().equals(QuestionTypeEnum.SingleChoice.getCode())) + .filter(e -> Objects.equals(e.getQuestionType(), QuestionTypeEnum.SingleChoice.getCode())) .collect(Collectors.toMap(Question::getId, Question::getScore)); selectRandomScores(multiple, radioMap, questionTypeVM.getSingleChoice(), radioSource); -- Gitblit v1.8.0