下一题不需要答案

cloud-research-service/src/main/java/com/yizhi/research/application/service/impl/TrResearchQuestionServiceImpl.java

@@ -2,6 +2,7 @@ package com.yizhi.research.application.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.yizhi.application.orm.id.IdGenerator;
 import com.yizhi.core.application.context.ContextHolder;
 import com.yizhi.core.application.context.RequestContext;
@@ -692,6 +693,7 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
                 //返回下一题
                 if (myQuestion.getNum() == null) {
                     trResearchQuestion.setNo(getNextNo(answerQuestionVo));
+                    answerQuestionVo = new AnswerQuestionVo();
                 } else {
                     trResearchQuestion.setNo(myQuestion.getNum());
                 }
@@ -739,6 +741,7 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
                 answerQuestionVo.setQuestionType(trResearchQuestion.getType());
                 map = new HashMap<String, Object>(6);
                 map.put("answer_question_id", trResearchAnswerQuestion.getId());
+                List<AnswerQuestionItemVo> questionItems  = Lists.newArrayList();
                 List<TrResearchAnswerQuestionResult> trResearchAnswerQuestionResults = trResearchAnswerQuestionResultMapper.selectByMap(map);
                 if (!CollectionUtils.isEmpty(options)) {
                     for (TrResearchQuestionOption option1 : options) {
@@ -762,6 +765,17 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
                     }
                     answerOptions.add(answer);
                 }
+
+                if (!CollectionUtils.isEmpty(trResearchAnswerQuestionResults)) {
+                    for (TrResearchAnswerQuestionResult result : trResearchAnswerQuestionResults) {
+                        AnswerQuestionItemVo itemVo = new AnswerQuestionItemVo();
+                        itemVo.setContent(result.getContent());
+                        itemVo.setOptionId(result.getOptionId());
+                        itemVo.setScore(result.getScore());
+                        questionItems.add(itemVo);
+                    }
+                    answerQuestionVo.setQuestionItems(questionItems);
+                }
             }
             if (!CollectionUtils.isEmpty(answerOptions)) {
                 trResearchQuestion.setOptions(answerOptions);
@@ -769,6 +783,7 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
             TrResearchQuestionVo trResearchQuestionVo=new TrResearchQuestionVo();
             BeanUtils.copyProperties(trResearchQuestion,trResearchQuestionVo);
             myQuestion.setQuestion(trResearchQuestionVo);
+            myQuestion.setAnswerQuestionVo(answerQuestionVo);
             return myQuestion;
         } catch (Exception e) {
             e.printStackTrace();