Merge pull request '题库修改' (#4) from dev-zcx into master

Reviewed-on: http://118.31.23.45:3000/caolin/driver-server/pulls/4

src/main/java/com/jwl/driver/server/entity/TdQuestion.java

@@ -174,4 +174,28 @@ public class TdQuestion implements Serializable {
     @TableField("EXAM_KEYS")
     private String examKeys;
 
+    /**
+     * 是否精讯500题
+     */
+    @TableField("IS_VIP")
+    private Integer isVip;
+
+    /**
+     * 是否精讯600题
+     */
+    @TableField("IS_VIP2")
+    private Integer isVip2;
+
+    /**
+     * 是否密卷1
+     */
+    @TableField("IS_EXAM1")
+    private Integer isExam1;
+
+    /**
+     * 是否密卷2
+     */
+    @TableField("IS_EXAM2")
+    private Integer isExam2;
+
 }

src/main/java/com/jwl/driver/server/vo/QusetionVo.java

@@ -171,4 +171,22 @@ public class QusetionVo {
      */
     @ApiModelProperty("考点")
     private String examKeys;
+
+    /**
+     * 是否精讯600题
+     */
+    @ApiModelProperty("精讯600题")
+    private Integer isVip2;
+
+    /**
+     * 是否密卷1
+     */
+    @ApiModelProperty("是否密卷1")
+    private Integer isExam1;
+
+    /**
+     * 是否密卷2
+     */
+    @ApiModelProperty("是否密卷2")
+    private Integer isExam2;
 }

src/main/resources/mapper/TdQuestionMapper.xml

@@ -29,7 +29,10 @@
         tq.IS_VIP,
         tq.IS_ERROR,
         tq.IS_NEW,
-        tq.EXAM_KEYS
+        tq.EXAM_KEYS,
+        tq.IS_EXAM1,
+        tq.IS_EXAM2,
+        tq.IS_VIP2
         from td_question tq
         left join td_point_question tpq on tq.QUESTION_ID = tpq.QUESTION_ID and tq.CAR_TYPE_ID = tpq.CAR_TYPE_ID and
         tpq.IS_ACTIVE = '0'
@@ -100,7 +103,10 @@
         tq.IS_VIP,
         tq.IS_ERROR,
         tq.IS_NEW,
-        tq.EXAM_KEYS
+        tq.EXAM_KEYS,
+        tq.IS_EXAM1,
+        tq.IS_EXAM2,
+        tq.IS_VIP2
         from td_question tq
         <where>
             tq.IS_ACTIVE = '0'
@@ -132,6 +138,15 @@
             <if test="qusetionVo.examKeys !=null">
                 EXAM_KEYS = #{qusetionVo.examKeys},
             </if>
+            <if test="qusetionVo.isVip2 !=null">
+                IS_VIP2 = #{qusetionVo.isVip2},
+            </if>
+            <if test="qusetionVo.isExam1 !=null">
+                IS_EXAM1 = #{qusetionVo.isExam1},
+            </if>
+            <if test="qusetionVo.isExam2 !=null">
+                IS_EXAM2 = #{qusetionVo.isExam2},
+            </if>
         </trim>
         where QUESTION_ID = #{qusetionVo.questionId}
     </update>