Merge branch 'master' of ssh://1.15.26.233:10022/miaxis/twzd

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

@@ -119,29 +119,59 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
 
     @Override
     public List<QuestionInfo> selectTestQuestionInfo(QuestionInfoTestDTO questionInfoTestDTO) {
-        if(questionInfoTestDTO.getSubject()==1){
-            questionInfoTestDTO.setQuestionType(1);
-            questionInfoTestDTO.setNum(40);
-            List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
-            questionInfoTestDTO.setQuestionType(2);
-            questionInfoTestDTO.setNum(60);
-            List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
-            return list1;
-        } else if (questionInfoTestDTO.getSubject()==4) {
-            questionInfoTestDTO.setQuestionType(1);
-            questionInfoTestDTO.setNum(30);
-            List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
-            questionInfoTestDTO.setQuestionType(2);
-            questionInfoTestDTO.setNum(10);
-            List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
-            questionInfoTestDTO.setQuestionType(3);
-            questionInfoTestDTO.setNum(10);
-            System.out.println(list2.size());
-            List<QuestionInfo> list3 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
-            list1.addAll(list2);
-            list1.addAll(list3);
-            return list1;
+
+
+        if("1".equals(questionInfoTestDTO.getLiceMoto())) {
+            if(questionInfoTestDTO.getSubject()==1){
+                questionInfoTestDTO.setQuestionType(1);
+                questionInfoTestDTO.setNum(20);
+                List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                questionInfoTestDTO.setQuestionType(2);
+                questionInfoTestDTO.setNum(30);
+                List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                list1.addAll(list2);
+                return list1;
+            } else if (questionInfoTestDTO.getSubject()==4) {
+                questionInfoTestDTO.setQuestionType(1);
+                questionInfoTestDTO.setNum(20);
+                List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                questionInfoTestDTO.setQuestionType(2);
+                questionInfoTestDTO.setNum(20);
+                List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                questionInfoTestDTO.setQuestionType(3);
+                questionInfoTestDTO.setNum(10);
+                List<QuestionInfo> list3 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                list1.addAll(list2);
+                list1.addAll(list3);
+                return list1;
+            }
+        } else {
+            if(questionInfoTestDTO.getSubject()==1){
+                questionInfoTestDTO.setQuestionType(1);
+                questionInfoTestDTO.setNum(40);
+                List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                questionInfoTestDTO.setQuestionType(2);
+                questionInfoTestDTO.setNum(60);
+                List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                list1.addAll(list2);
+                return list1;
+            } else if (questionInfoTestDTO.getSubject()==4) {
+                questionInfoTestDTO.setQuestionType(1);
+                questionInfoTestDTO.setNum(30);
+                List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                questionInfoTestDTO.setQuestionType(2);
+                questionInfoTestDTO.setNum(10);
+                List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                questionInfoTestDTO.setQuestionType(3);
+                questionInfoTestDTO.setNum(10);
+                List<QuestionInfo> list3 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                list1.addAll(list2);
+                list1.addAll(list3);
+                return list1;
+            }
         }
+
+
         return null;
     }
 

twzd-service/src/main/resources/mapper/qustion/QuestionInfoMapper.xml

@@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTestQuestionInfoList"   resultMap="QuestionInfoResult">
         select * from question_info
         <where>
-            and excell_issue_name like '%必学%'
+            <if test="liceMoto == null or liceMoto == ''"> and excell_issue_name like '%必学%'</if>
             <if test="subject != null"> and subject = #{subject}</if>
             <if test="questionType != null"> and question_type = #{questionType}</if>
             <if test="liceCar != null  and liceCar != ''"> and lice_car = #{liceCar} </if>
@@ -360,4 +360,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+
+
+
 </mapper>