fix 新增随机试卷

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/ExamTempServiceImpl.java

@@ -127,6 +127,7 @@ public class ExamTempServiceImpl extends ServiceImpl<ExamTempMapper, ExamTemp> i
         }
         ExamTempVo examTempVo = BeanUtil.toBean(add, ExamTempVo.class);
         examTempVo.setQuestionList(questionlist);
+        examTempVo.setType(2);
         return examTempVo;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/ExamTempVo.java

@@ -45,6 +45,11 @@ public class ExamTempVo {
 	@ApiModelProperty("订单商品ID")
 	private Long orderGoodsId;
 
+	/** 做题模式 1章卷 2随机练习 */
+	@Excel(name = "做题模式 1章卷 2随机练习")
+	@ApiModelProperty("做题模式 1章卷 2随机练习")
+	private Integer type;
+
 	@ApiModelProperty("题目列表")
 	private List<QuestionVo> questionList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionAddBo.java

@@ -35,4 +35,7 @@ public class CollectQuestionAddBo {
     /** 订单商品ID */
     @ApiModelProperty("订单商品ID")
     private Long orderGoodsId;
+    /** 做题模式 1章卷 2随机练习 */
+    @ApiModelProperty("做题模式 1章卷 2随机练习")
+    private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionEditBo.java

@@ -34,4 +34,7 @@ public class CollectQuestionEditBo {
     /** 订单商品ID */
     @ApiModelProperty("订单商品ID")
     private Long orderGoodsId;
+    /** 做题模式 1章卷 2随机练习 */
+    @ApiModelProperty("做题模式 1章卷 2随机练习")
+    private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionQueryBo.java

@@ -61,4 +61,7 @@ public class CollectQuestionQueryBo extends BaseEntity {
 	/** 业务层次id */
 	@ApiModelProperty("业务层次id")
 	private Long businessId;
+	/** 做题模式 1章卷 2随机练习 */
+	@ApiModelProperty("做题模式 1章卷 2随机练习")
+	private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/domain/CollectQuestion.java

@@ -44,4 +44,6 @@ private static final long serialVersionUID=1L;
     private Long goodsId;
     /** 订单商品ID */
     private Long orderGoodsId;
+    /** 做题模式 1章卷 2随机练习 */
+    private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/vo/CollectQuestionVo.java

@@ -54,4 +54,8 @@ public class CollectQuestionVo {
 	@Excel(name = "订单商品ID")
 	@ApiModelProperty("订单商品ID")
 	private Long orderGoodsId;
+	/** 做题模式 1章卷 2随机练习 */
+	@Excel(name = "做题模式 1章卷 2随机练习")
+	@ApiModelProperty("做题模式 1章卷 2随机练习")
+	private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamRecordAddBo.java

@@ -88,4 +88,7 @@ public class UserExamRecordAddBo {
     /** 提交时间 */
     @ApiModelProperty("提交时间")
     private Long commitTime;
+    /** 做题模式 1章卷 2随机练习 */
+    @ApiModelProperty("做题模式 1章卷 2随机练习")
+    private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamRecordEditBo.java

@@ -106,4 +106,7 @@ public class UserExamRecordEditBo {
     /** 提交时间 */
     @ApiModelProperty("提交时间")
     private Long commitTime;
+    /** 做题模式 1章卷 2随机练习 */
+    @ApiModelProperty("做题模式 1章卷 2随机练习")
+    private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamRecordQueryBo.java

@@ -70,4 +70,7 @@ public class UserExamRecordQueryBo extends BaseEntity {
 	/** 业务ID */
 	@ApiModelProperty("业务ID")
 	private Long businessId;
+	/** 做题模式 1章卷 2随机练习 */
+	@ApiModelProperty("做题模式 1章卷 2随机练习")
+	private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordAddBo.java

@@ -66,4 +66,7 @@ public class UserExamWrongRecordAddBo {
     /** 班级ID */
     @ApiModelProperty("班级ID")
     private Long gradeId;
+    /** 做题模式 1章卷 2随机练习 */
+    @ApiModelProperty("做题模式 1章卷 2随机练习")
+    private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordEditBo.java

@@ -53,4 +53,7 @@ public class UserExamWrongRecordEditBo {
     /** 订单商品ID */
     @ApiModelProperty("订单商品ID")
     private Long orderGoodsId;
+    /** 做题模式 1章卷 2随机练习 */
+    @ApiModelProperty("做题模式 1章卷 2随机练习")
+    private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordQueryBo.java

@@ -67,4 +67,7 @@ public class UserExamWrongRecordQueryBo extends BaseEntity {
 	/** 业务ID */
 	@ApiModelProperty("业务ID")
 	private Long businessId;
+	/** 做题模式 1章卷 2随机练习 */
+	@ApiModelProperty("做题模式 1章卷 2随机练习")
+	private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamRecord.java

@@ -75,4 +75,6 @@ private static final long serialVersionUID=1L;
     private Long lessQuestionNum;
     /** 提交时间 */
     private Long commitTime;
+    /** 做题模式 1章卷 2随机练习 */
+    private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamWrongRecord.java

@@ -60,4 +60,6 @@ private static final long serialVersionUID=1L;
     private Long chapterId;
     /** 班级ID */
     private Long gradeId;
+    /** 做题模式 1章卷 2随机练习 */
+    private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamRecordVo.java

@@ -139,4 +139,8 @@ public class UserExamRecordVo {
 	@Excel(name = "提交时间")
 	@ApiModelProperty("提交时间")
 	private Long commitTime;
+	/** 做题模式 1章卷 2随机练习 */
+	@Excel(name = "做题模式 1章卷 2随机练习")
+	@ApiModelProperty("做题模式 1章卷 2随机练习")
+	private Long doMode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamWrongRecordVo.java

@@ -146,4 +146,8 @@ public class UserExamWrongRecordVo {
 	/** 班级ID */
 	@ApiModelProperty("班级ID")
 	private Long gradeId;
+	/** 做题模式 1章卷 2随机练习 */
+	@Excel(name = "做题模式 1章卷 2随机练习")
+	@ApiModelProperty("做题模式 1章卷 2随机练习")
+	private Long doMode;
 }

zhongzheng-system/src/main/resources/mapper/modules/bank/ExamTempMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="code" column="code"/>
     </resultMap>
 
-    <select id="getQuestionList" parameterType="com.zhongzheng.modules.bank.bo.ExamTempQueryBo" resultType="QuestionResultVo">
+    <select id="getQuestionList" parameterType="com.zhongzheng.modules.bank.bo.ExamTempQueryBo" resultMap="QuestionResultVo">
         SELECT
             *
         FROM

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectQuestionMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examId" column="exam_id"/>
         <result property="goodsId" column="goods_id"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="doMode" column="do_mode"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.collect.vo.CollectQuestionVo" id="CollectQuestionVoResult">
@@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="type" column="type"/>
         <result property="num" column="num"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="doMode" column="do_mode"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.bank.vo.QuestionVo" id="QuestionResultVo">

zhongzheng-system/src/main/resources/mapper/modules/user/UserExamRecordMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="lessQuestionNum" column="less_question_num"/>
         <result property="commitTime" column="commit_time"/>
+        <result property="doMode" column="do_mode"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamRecordVo" id="UserExamRecordVoResult">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="score" column="score"/>
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="commitTime" column="commit_time"/>
+        <result property="doMode" column="do_mode"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamWrongRecordVo" id="UserExamRecordQuestionVoResult">
@@ -87,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="knowledgeIds" column="knowledge_ids"/>
         <result property="publishStatus" column="publish_status"/>
         <result property="code" column="code"/>
+        <result property="doMode" column="do_mode"/>
 
     </resultMap>
 

zhongzheng-system/src/main/resources/mapper/modules/user/UserExamWrongRecordMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="moduleExamId" column="module_exam_id"/>
         <result property="chapterExamId" column="chapter_exam_id"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="doMode" column="do_mode"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamWrongRecordVo" id="UserExamWrongRecordVoResult">
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="moduleExamId" column="module_exam_id"/>
         <result property="chapterExamId" column="chapter_exam_id"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="doMode" column="do_mode"/>
     </resultMap>