Merge branch 'dev-v5.2' into dev

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

@@ -790,8 +790,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             addBo.setOptionsId(j);
             optionsList.add(addBo);
             if("是".equals(entity.getAnswer())){
+                answerList.add(j);
                 if(type==1){ //单选
-                    answerList.add(j);
                     break;
                 }
             }

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

@@ -84,4 +84,5 @@ public class UserExamRecordAddBo {
     /** 订单商品ID */
     @ApiModelProperty("订单商品ID")
     private Long orderGoodsId;
+    private Long lessQuestionNum;
 }

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

@@ -102,4 +102,5 @@ public class UserExamRecordEditBo {
     /** 订单商品ID */
     @ApiModelProperty("订单商品ID")
     private Long orderGoodsId;
+    private Long lessQuestionNum;
 }

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

@@ -72,4 +72,5 @@ private static final long serialVersionUID=1L;
     private Long allQuestionNum;
     /** 订单商品ID */
     private Long orderGoodsId;
+    private Long lessQuestionNum;
 }

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

@@ -121,4 +121,5 @@ public class UserExamRecordVo {
 	@Excel(name = "订单商品ID")
 	@ApiModelProperty("订单商品ID")
 	private Long orderGoodsId;
+	private Long lessQuestionNum;
 }

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

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="score" column="score"/>
         <result property="allQuestionNum" column="all_question_num"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="lessQuestionNum" column="less_question_num"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamRecordVo" id="UserExamRecordVoResult">