From f043c9f4b94cbe476ce378eaeb217ac88b9c6444 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Wed, 26 Aug 2020 12:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E8=AF=95=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tms/service/impl/EvaluationRulesServiceImpl.java | 12 ++++++------
 .../msdw/tms/service/impl/QuestionsServiceImpl.java  | 11 +++--------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java
index 3977fd4..dd10e50 100644
--- a/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java
@@ -55,11 +55,11 @@ public class EvaluationRulesServiceImpl extends ServiceImpl<EvaluationRulesDao,
 
         evaluationRulesVO.setTotalQuestionNum(questionsService.count(queryWrapper));//总题数
 
-        int totalSingleNum = questionsService.count(queryWrapper.eq("question_type_no",
+        int totalSingleNum = questionsService.count(queryWrapper.eq("question_type",
                 Constant.QuestionType.SINGLE_CHOICE.getType()));//单选题总数
-        int totalMultipleNum = questionsService.count(queryWrapper.eq("question_type_no",
+        int totalMultipleNum = questionsService.count(queryWrapper.eq("question_type",
                 Constant.QuestionType.MULTIPLE_CHOICE.getType()));//多选题总数
-        int totalJudgmentNum = questionsService.count(queryWrapper.eq("question_type_no",
+        int totalJudgmentNum = questionsService.count(queryWrapper.eq("question_type",
                 Constant.QuestionType.TRUE_OR_FALSE.getType()));//判断题总数
 
         evaluationRulesVO.setTotalSingleNum(totalSingleNum);
@@ -88,19 +88,19 @@ public class EvaluationRulesServiceImpl extends ServiceImpl<EvaluationRulesDao,
         } else if (evaluationType.equals(Constant.RulesType.CUSTOMIZE.getType())) {//自定义
             if (evaluationRules.getIsSingleEnable().equals(Constant.IsEnable.ENABLE.getType())) {//启用
                 int singleNum = evaluationRules.getSingleNum();
-                int totalSingleNum = questionsService.count(queryWrapper.eq("question_type_no",
+                int totalSingleNum = questionsService.count(queryWrapper.eq("question_type",
                         Constant.QuestionType.SINGLE_CHOICE.getType()));//单选题总数
                 numIncalid(singleNum, totalSingleNum);
             }
             if (evaluationRules.getIsMultipleEnable().equals(Constant.IsEnable.ENABLE.getType())) {//启用
                 int multipleNum = evaluationRules.getMultipleNum();
-                int totalMultipleNum = questionsService.count(queryWrapper.eq("question_type_no",
+                int totalMultipleNum = questionsService.count(queryWrapper.eq("question_type",
                         Constant.QuestionType.MULTIPLE_CHOICE.getType()));//多选题总数
                 numIncalid(multipleNum, totalMultipleNum);
             }
             if (evaluationRules.getIsJudgmentEnable().equals(Constant.IsEnable.ENABLE.getType())) {//启用
                 int judgmentNum = evaluationRules.getJudgmentNum();
-                int totalJudgmentNum = questionsService.count(queryWrapper.eq("question_type_no",
+                int totalJudgmentNum = questionsService.count(queryWrapper.eq("question_type",
                         Constant.QuestionType.TRUE_OR_FALSE.getType()));//判断题总数
                 numIncalid(judgmentNum, totalJudgmentNum);
             }
diff --git a/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java
index 343c911..42eff09 100644
--- a/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java
@@ -460,32 +460,27 @@ public class QuestionsServiceImpl extends ServiceImpl<QuestionsDao, QuestionsEnt
             if (evaluationRules.getIsSingleEnable().equals(Constant.IsEnable.ENABLE.getType())) {
                 singleNum = evaluationRules.getSingleNum();
 
-                List<QuestionsEntity> singleChoice = this.list(queryWrapper.eq("question_type_no",
+                List<QuestionsEntity> singleChoice = this.list(queryWrapper.eq("question_type",
                         Constant.QuestionType.SINGLE_CHOICE.getType()));
                 set.addAll(getRandomList(singleNum, singleChoice));
             }
             if (evaluationRules.getIsMultipleEnable().equals(Constant.IsEnable.ENABLE.getType())) {
                 multipleNum = evaluationRules.getMultipleNum();
 
-                List<QuestionsEntity> multipleChoice = this.list(queryWrapper.eq("question_type_no",
+                List<QuestionsEntity> multipleChoice = this.list(queryWrapper.eq("question_type",
                         Constant.QuestionType.MULTIPLE_CHOICE.getType()));
                 set.addAll(getRandomList(multipleNum, multipleChoice));
             }
             if (evaluationRules.getIsJudgmentEnable().equals(Constant.IsEnable.ENABLE.getType())) {
                 judgmentNum = evaluationRules.getJudgmentNum();
 
-                List<QuestionsEntity> judgments = this.list(queryWrapper.eq("question_type_no",
+                List<QuestionsEntity> judgments = this.list(queryWrapper.eq("question_type",
                         Constant.QuestionType.TRUE_OR_FALSE.getType()));
                 set.addAll(getRandomList(judgmentNum, judgments));
             }
             // 总题数等于各类题目数量之和
             evaluation.setQuestionNum(singleNum + multipleNum + judgmentNum);
         }
-//        Set<QuestionsVO> collect = set.stream().map(item -> {
-//            QuestionsVO questionsVO = new QuestionsVO();
-//            BeanUtils.copyProperties(item, questionsVO);
-//            return questionsVO;
-//        }).collect(Collectors.toSet());
         evaluation.setQuestions(set);
 
         return evaluation;