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

twzd-admin/src/main/java/com/miaxis/app/controller/h5/QuestionInfoController.java

@@ -7,6 +7,7 @@ import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionInfoDTO;
 import com.miaxis.question.dto.QuestionInfoFlDTO;
+import com.miaxis.question.dto.QuestionInfoTestDTO;
 import com.miaxis.question.service.IQuestionInfoService;
 import com.miaxis.question.vo.QuestionInfoDfVO;
 import com.miaxis.question.vo.QuestionInfoFlVO;
@@ -170,5 +171,16 @@ public class QuestionInfoController extends BaseController{
         List<QuestionInfo> list = questionInfoService.selectNormalQuestionInfoList(questionInfoDTO);
         return toResponsePageInfo(list);
     }
+
+
+    /**
+     * 查询模拟考试题库
+     */
+    @GetMapping("/selectTestQuestionInfo")
+    @ApiOperation("查询模拟考试题库")
+    public ResponsePageInfo<QuestionInfo> selectTestQuestionInfo(@ModelAttribute QuestionInfoTestDTO questionInfoTestDTO){
+        List<QuestionInfo> list = questionInfoService.selectTestQuestionInfo(questionInfoTestDTO);
+        return toResponsePageInfo(list);
+    }
 }
 

twzd-service/src/main/java/com/miaxis/question/dto/QuestionInfoTestDTO.java

@@ -0,0 +1,41 @@
+package com.miaxis.question.dto;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import com.sun.corba.se.spi.presentation.rmi.IDLNameTranslator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 地方题选分类返回对象
+ * @author miaxis
+ * @date 2021-10-20
+ */
+@Data
+@ApiModel(value = "QuestionInfoTestDTO", description = "模拟考试输入对象")
+public class QuestionInfoTestDTO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "科目")
+    private Integer subject;
+
+    @ApiModelProperty(value = "是否小车 1：是 否：空")
+    private String liceCar;
+
+    @ApiModelProperty(value = "是否客车 1：是 否：空")
+    private String liceBus;
+
+    @ApiModelProperty(value = "是否货车 1：是 否：空")
+    private String liceTruck;
+
+    @ApiModelProperty(value = "是否摩托车 1：是 否：空")
+    private String liceMoto;
+
+    @ApiModelProperty(hidden = true)
+    private Integer questionType;
+
+    @ApiModelProperty(hidden = true)
+    private Integer num;
+
+}

twzd-service/src/main/java/com/miaxis/question/mapper/QuestionInfoMapper.java

@@ -2,10 +2,7 @@ package com.miaxis.question.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.dto.QuestionInfoDTO;
-import com.miaxis.question.dto.QuestionInfoFlDTO;
-import com.miaxis.question.dto.QuestionInfoSortDTO;
-import com.miaxis.question.dto.QuestionInfoSortUpateDTO;
+import com.miaxis.question.dto.*;
 import com.miaxis.question.vo.*;
 
 import java.util.List;
@@ -57,4 +54,5 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
     void updateSortById(QuestionInfoSortUpateDTO dto);
 
+    List<QuestionInfo> selectTestQuestionInfoList(QuestionInfoTestDTO questionInfoTestDTO);
 }

twzd-service/src/main/java/com/miaxis/question/service/IQuestionInfoService.java

@@ -2,10 +2,7 @@ package com.miaxis.question.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.dto.QuestionInfoDTO;
-import com.miaxis.question.dto.QuestionInfoFlDTO;
-import com.miaxis.question.dto.QuestionInfoSortDTO;
-import com.miaxis.question.dto.QuestionInfoSortUpateDTO;
+import com.miaxis.question.dto.*;
 import com.miaxis.question.vo.*;
 
 import java.util.List;
@@ -42,5 +39,7 @@ public interface IQuestionInfoService extends IService<QuestionInfo>{
     void updateSortById(QuestionInfoSortUpateDTO dto);
 
     List<QuestionInfoExcelTypeVo> getIssueTypes(int issueTypeValue, Integer typeValue);
+
+    List<QuestionInfo> selectTestQuestionInfo(QuestionInfoTestDTO questionInfoTestDTO);
 }
 

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

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.exception.user.UserException;
 import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.dto.QuestionInfoDTO;
-import com.miaxis.question.dto.QuestionInfoFlDTO;
-import com.miaxis.question.dto.QuestionInfoSortDTO;
-import com.miaxis.question.dto.QuestionInfoSortUpateDTO;
+import com.miaxis.question.dto.*;
 import com.miaxis.question.mapper.QuestionInfoMapper;
 import com.miaxis.question.service.IQuestionInfoService;
 import com.miaxis.question.vo.*;
@@ -120,4 +117,32 @@ 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;
+        }
+        return null;
+    }
+
 }

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

@@ -345,4 +345,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectTestQuestionInfoList"   resultMap="QuestionInfoResult">
+        select * from question_info
+        <where>
+            and excell_issue_name like '%必学%'
+            <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>
+            <if test="liceBus != null  and liceBus != ''"> and lice_bus = #{liceBus}</if>
+            <if test="liceTruck != null  and liceTruck != ''"> and lice_truck = #{liceTruck}</if>
+            <if test="liceMoto != null  and liceMoto != ''"> and lice_moto = #{liceMoto}</if>
+        </where>
+        ORDER BY rand() limit 0,${num}
+    </select>
+
+
 </mapper>