科目四抽题

twzd-service/src/main/java/com/miaxis/question/service/impl/QuestionInfoServiceImpl.java

@@ -174,16 +174,27 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
                 return list1;
             } else if (questionInfoTestDTO.getSubject()==4) {
                 questionInfoTestDTO.setQuestionType(1);
-                questionInfoTestDTO.setNum(30);
+                questionInfoTestDTO.setNum(20);
+                questionInfoTestDTO.setExcellIssueName("必");
                 List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
-                questionInfoTestDTO.setQuestionType(2);
+
+                questionInfoTestDTO.setQuestionType(1);
                 questionInfoTestDTO.setNum(10);
+                questionInfoTestDTO.setExcellIssueName("新");
                 List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
-                questionInfoTestDTO.setQuestionType(3);
+
+                questionInfoTestDTO.setQuestionType(2);
                 questionInfoTestDTO.setNum(10);
+                questionInfoTestDTO.setExcellIssueName("必");
                 List<QuestionInfo> list3 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+
+                questionInfoTestDTO.setQuestionType(3);
+                questionInfoTestDTO.setNum(10);
+                questionInfoTestDTO.setExcellIssueName("必");
+                List<QuestionInfo> list4 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
                 list1.addAll(list2);
                 list1.addAll(list3);
+                list1.addAll(list4);
                 return list1;
             }
         }