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

twzd-service/src/main/java/com/miaxis/question/domain/QuestionInfo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.miaxis.common.annotation.Excel;
+
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -121,30 +122,6 @@ public class QuestionInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "读题+答案语音URL")
     private String explainjsmp3;
 
-    /** 是否是科目一题目 */
-    @Excel(name = "是否是科目一题目")
-    @TableField("subject_1")
-    @ApiModelProperty(value = "是否是科目一题目")
-    private String subject1;
-
-    /** 是否是科目二题目 */
-    @Excel(name = "是否是科目二题目")
-    @TableField("subject_2")
-    @ApiModelProperty(value = "是否是科目二题目")
-    private String subject2;
-
-    /** 是否是科目三题目 */
-    @Excel(name = "是否是科目三题目")
-    @TableField("subject_3")
-    @ApiModelProperty(value = "是否是科目三题目")
-    private String subject3;
-
-    /** 是否是科目四题目 */
-    @Excel(name = "是否是科目四题目")
-    @TableField("subject_4")
-    @ApiModelProperty(value = "是否是科目四题目")
-    private String subject4;
-
     /** 是否是C1,C2,C3驾驶证题目 */
     @Excel(name = "是否是C1,C2,C3驾驶证题目")
     @TableField("lice_car")
@@ -237,4 +214,37 @@ public class QuestionInfo extends BaseBusinessEntity{
     private Integer questionType;
 
 
+    /** 题目类型 */
+    @Excel(name = "题目类型")
+    @TableField("question_type")
+    @ApiModelProperty(value = "题目类型 1判断，2选择，3多选")
+    private Integer subject;
+
+    /** 分类练习排序字段 */
+    @Excel(name = "分类练习排序字段")
+    @TableField("class_sort")
+    @ApiModelProperty(value = "分类练习排序字段")
+    private Integer classSort;
+
+    /** 精选考题排序字段 */
+    @Excel(name = "精选考题排序字段")
+    @TableField("excell_sort")
+    @ApiModelProperty(value = "精选考题排序字段")
+    private Integer excellSort;
+
+
+    /** 顺序练习排序字段 */
+    @Excel(name = "顺序练习排序字段")
+    @TableField("seque_sort")
+    @ApiModelProperty(value = "顺序练习排序字段")
+    private Integer sequeSort;
+
+
+    /** 地方专题排序字段 */
+    @Excel(name = "地方专题排序字段")
+    @TableField("place_sort")
+    @ApiModelProperty(value = "地方专题排序字段")
+    private Integer placeSort;
+
+
 }

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

@@ -86,21 +86,6 @@ public class QuestionInfoDTO extends BaseBusinessEntity{
     @ApiModelProperty(value = "读题+答案语音URL")
     private String explainjsmp3;
 
-    /** 是否是科目一题目 */
-    @ApiModelProperty(value = "是否是科目一题目")
-    private String subject1;
-
-    /** 是否是科目二题目 */
-    @ApiModelProperty(value = "是否是科目二题目")
-    private String subject2;
-
-    /** 是否是科目三题目 */
-    @ApiModelProperty(value = "是否是科目三题目")
-    private String subject3;
-
-    /** 是否是科目四题目 */
-    @ApiModelProperty(value = "是否是科目四题目")
-    private String subject4;
 
     /** 是否是C1,C2,C3驾驶证题目 */
     @ApiModelProperty(value = "是否是C1,C2,C3驾驶证题目")
@@ -168,4 +153,30 @@ public class QuestionInfoDTO extends BaseBusinessEntity{
     private Integer questionType;
 
 
+    /** 科目 */
+    @ApiModelProperty(value = "科目")
+    private Integer subject;
+
+//    /** 分类练习排序字段 */
+//    @ApiModelProperty(value = "分类练习排序字段")
+//    private Integer classSort;
+//
+//    /** 精选考题排序字段 */
+//    @ApiModelProperty(value = "精选考题排序字段")
+//    private Integer excellSort;
+//
+//
+//    /** 顺序练习排序字段 */
+//    @ApiModelProperty(value = "顺序练习排序字段")
+//    private Integer sequeSort;
+//
+//
+//    /** 地方专题排序字段 */
+//    @ApiModelProperty(value = "地方专题排序字段")
+//    private Integer placeSort;
+
+    /** 排序字段 */
+    @ApiModelProperty(value = "分类练习：class_sort;精选考题:excell_sort;顺序练习:seque_sort;地方专题:place_sort;")
+    private String sort;
+
 }

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

@@ -16,21 +16,6 @@ public class QuestionInfoFlDTO extends BaseBusinessEntity{
     private static final long serialVersionUID = 1L;
 
 
-    /** 是否是科目一题目 */
-    @ApiModelProperty(value = "是否是科目一题目 1:是 0:否")
-    private String subject1;
-
-    /** 是否是科目二题目 */
-    @ApiModelProperty(value = "是否是科目二题目 1:是 0:否")
-    private String subject2;
-
-    /** 是否是科目三题目 */
-    @ApiModelProperty(value = "是否是科目三题目 1:是 2:否")
-    private String subject3;
-
-    /** 是否是科目四题目 */
-    @ApiModelProperty(value = "是否是科目四题目 1:是 2:否")
-    private String subject4;
 
     /** 是否是C1,C2,C3驾驶证题目 */
     @ApiModelProperty(value = "是否是C1,C2,C3驾驶证题目 1:是 2:否")
@@ -48,6 +33,27 @@ public class QuestionInfoFlDTO extends BaseBusinessEntity{
     @ApiModelProperty(value = "是否是D,E,F驾驶证题目 1:是 2:否")
     private String liceMoto;
 
+    /** 科目 */
+    @ApiModelProperty(value = "科目")
+    private Integer subject;
+
+    /** 分类练习排序字段 */
+    @ApiModelProperty(value = "分类练习排序字段")
+    private Integer classSort;
+
+    /** 精选考题排序字段 */
+    @ApiModelProperty(value = "精选考题排序字段")
+    private Integer excellSort;
+
+
+    /** 顺序练习排序字段 */
+    @ApiModelProperty(value = "顺序练习排序字段")
+    private Integer sequeSort;
+
+
+    /** 地方专题排序字段 */
+    @ApiModelProperty(value = "地方专题排序字段")
+    private Integer placeSort;
 
 
 

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

@@ -22,10 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="issuemp3"    column="issuemp3"    />
         <result property="answermp3"    column="answermp3"    />
         <result property="explainjsmp3"    column="explainjsmp3"    />
-        <result property="subject1"    column="subject_1"    />
-        <result property="subject2"    column="subject_2"    />
-        <result property="subject3"    column="subject_3"    />
-        <result property="subject4"    column="subject_4"    />
         <result property="liceCar"    column="lice_car"    />
         <result property="liceBus"    column="lice_bus"    />
         <result property="liceTruck"    column="lice_truck"    />
@@ -42,6 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="classIssueName"    column="class_issue_name"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="subject"    column="subject"    />
+        <result property="classSort"    column="class_sort"    />
+        <result property="excellSort"    column="excell_sort"    />
+        <result property="sequeSort"    column="seque_sort"    />
+        <result property="placeSort"    column="place_sort"    />
+
+
     </resultMap>
 
     <sql id="selectQuestionInfoVo">
@@ -67,10 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="issuemp3 != null  and issuemp3 != ''"> and issuemp3 = #{issuemp3}</if>
             <if test="answermp3 != null  and answermp3 != ''"> and answermp3 = #{answermp3}</if>
             <if test="explainjsmp3 != null  and explainjsmp3 != ''"> and explainjsmp3 = #{explainjsmp3}</if>
-            <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>
@@ -85,10 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="placeIssueName != null  and placeIssueName != ''"> and place_issue_name like concat('%', #{placeIssueName}, '%')</if>
             <if test="excellIssueName != null  and excellIssueName != ''"> and excell_issue_name like concat('%', #{excellIssueName}, '%')</if>
             <if test="questionType != null "> and question_type = #{questionType}</if>
+            <if test="subject != null  and subject != ''"> and subject = #{subject}</if>
         </where>
 
         <if test="isRand!=null and isRand!=''"> order by rand() </if>
-
+        <if test="isRand==null or isRand==''"> order by ${sort}  </if>
     </select>
 
 
@@ -111,10 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="issuemp3 != null  and issuemp3 != ''"> and issuemp3 = #{issuemp3}</if>
             <if test="answermp3 != null  and answermp3 != ''"> and answermp3 = #{answermp3}</if>
             <if test="explainjsmp3 != null  and explainjsmp3 != ''"> and explainjsmp3 = #{explainjsmp3}</if>
-            <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>
@@ -131,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classIssueName != null  and classIssueName != ''"> and class_issue_name like concat('%', #{classIssueName}, '%')</if>
             <if test="questionType != null "> and question_type = #{questionType}</if>
         </where>
-        limit 0,5
+        limit 0,50
     </select>
 
 
@@ -154,10 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             excell_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="subject != null  and subject != ''"> and subject = #{subject}</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>
@@ -175,10 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             place_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="subject != null  and subject != ''"> and subject = #{subject}</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>
@@ -196,10 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         class_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="subject != null  and subject != ''"> and subject = #{subject}</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>
@@ -217,10 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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="subject != null  and subject != ''"> and subject = #{subject}</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>