顺序练习

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

@@ -11,6 +11,7 @@ import com.miaxis.question.service.IQuestionInfoService;
 import com.miaxis.question.vo.QuestionInfoDfVO;
 import com.miaxis.question.vo.QuestionInfoFlVO;
 import com.miaxis.question.vo.QuestionInfoJxVO;
+import com.miaxis.question.vo.QuestionInfoSxVO;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -150,6 +151,14 @@ public class QuestionInfoController extends BaseController{
         return questionInfoService.selectFlQuestionInfo(questionInfoFlDTO);
     }
 
+    /**
+     * 获取顺序练习分类
+     */
+    @GetMapping(value = "/selectSxQustionInfo")
+    @ApiOperation("获取顺序练习分类")
+    public List<QuestionInfoSxVO> selectSxQuestionInfo(@ModelAttribute QuestionInfoFlDTO questionInfoFlDTO) {
+        return questionInfoService.selectSxQuestionInfo(questionInfoFlDTO);
+    }
 
 
     /**

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

@@ -8,6 +8,7 @@ import com.miaxis.question.dto.QuestionInfoFlDTO;
 import com.miaxis.question.vo.QuestionInfoDfVO;
 import com.miaxis.question.vo.QuestionInfoFlVO;
 import com.miaxis.question.vo.QuestionInfoJxVO;
+import com.miaxis.question.vo.QuestionInfoSxVO;
 
 /**
  * 题库Mapper接口
@@ -28,6 +29,8 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
     List<QuestionInfoJxVO> selectJxQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
 
+    List<QuestionInfoSxVO> selectSxQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
+
     List<QuestionInfoDfVO> selectDfQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
 
     List<QuestionInfoFlVO> selectFlQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);

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

@@ -8,6 +8,7 @@ import com.miaxis.question.dto.QuestionInfoFlDTO;
 import com.miaxis.question.vo.QuestionInfoDfVO;
 import com.miaxis.question.vo.QuestionInfoFlVO;
 import com.miaxis.question.vo.QuestionInfoJxVO;
+import com.miaxis.question.vo.QuestionInfoSxVO;
 
 /**
  * 题库Service接口
@@ -33,4 +34,8 @@ public interface IQuestionInfoService extends IService<QuestionInfo>{
     List<QuestionInfoFlVO> selectFlQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
 
     List<QuestionInfo> selectNormalQuestionInfoList(QuestionInfoDTO questionInfoDTO);
+
+    List<QuestionInfoSxVO> selectSxQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
+
 }
+

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

@@ -1,17 +1,19 @@
 package com.miaxis.question.service.impl;
 
-import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionInfoDTO;
 import com.miaxis.question.dto.QuestionInfoFlDTO;
+import com.miaxis.question.mapper.QuestionInfoMapper;
+import com.miaxis.question.service.IQuestionInfoService;
 import com.miaxis.question.vo.QuestionInfoDfVO;
 import com.miaxis.question.vo.QuestionInfoFlVO;
 import com.miaxis.question.vo.QuestionInfoJxVO;
+import com.miaxis.question.vo.QuestionInfoSxVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.miaxis.question.mapper.QuestionInfoMapper;
-import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.service.IQuestionInfoService;
+
+import java.util.List;
 
 /**
  * 题库Service业务层处理
@@ -60,4 +62,9 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
         return questionInfoMapper.selectNormalQuestionInfoList(questionInfoDTO);
     }
 
+    @Override
+    public List<QuestionInfoSxVO> selectSxQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO) {
+        return questionInfoMapper.selectSxQuestionInfo(questionInfoFlDTO);
+    }
+
 }

twzd-service/src/main/java/com/miaxis/question/vo/QuestionInfoSxVO.java

@@ -0,0 +1,29 @@
+package com.miaxis.question.vo;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 精选选分类返回对象
+ *
+ * @author miaxis
+ * @date 2021-10-20
+ */
+@Data
+@ApiModel(value = "QuestionInfoJxVO", description = "题库分类查询对象")
+public class QuestionInfoSxVO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "精选题（包含科一到科四）")
+    private String sequeIssue;
+
+    @ApiModelProperty(value = "题目在精选中所属的模块名称")
+    private String sequeIssueName;
+
+
+
+
+}

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

@@ -209,4 +209,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         class_issue + 0 ASC
     </select>
 
+
+    <select id="selectSxQuestionInfo"  resultType="com.miaxis.question.vo.QuestionInfoSxVO">
+        SELECT
+        DISTINCT
+        case WHEN seque_issue_name is null then '地方专题' else seque_issue_name end as "seque_issue_name",
+        seque_issue
+        FROM question_info
+        <where>
+            <if test="subject1 != null  and subject1 != ''"> and subject_1 = #{subject1}</if>
+            <if test="subject2 != null  and subject2 != ''"> and subject_2 = #{subject2}</if>
+            <if test="subject3 != null  and subject3 != ''"> and subject_3 = #{subject3}</if>
+            <if test="subject4 != null  and subject4 != ''"> and subject_4 = #{subject4}</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
+        seque_issue + 0 ASC
+    </select>
+
+
 </mapper>