Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/Order.java

@@ -79,4 +79,5 @@ private static final long serialVersionUID=1L;
     private Integer status;
     /** 系统订单操作人ID */
     private Long createSysUserId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -517,6 +517,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if(classGradeVo==null){
                 throw new CustomException("班级不存在");
             }
+            if(classGradeVo.getStatus()!=1){
+                throw new CustomException("班级已失效");
+            }
             ClassGradeGoods gradeGoods = iClassGradeGoodsService.getOne(new LambdaQueryWrapper<ClassGradeGoods>().eq(ClassGradeGoods::getGradeId,gradeId)
             .eq(ClassGradeGoods::getGoodsId,goodsId));
             if(gradeGoods==null){
@@ -541,6 +544,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             ClassGradeQueryBo bo = new ClassGradeQueryBo();
             bo.setGoodsId(goodsId);
             bo.setPastDue(1L);
+            bo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
             List<ClassGradeVo> classGradeVoList =  iClassGradeService.queryList(bo);
             for(int i = 0; i < classGradeVoList.size(); i++){
                 ClassGradeVo classGradeVo = classGradeVoList.get(i);

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

@@ -69,4 +69,10 @@ public class UserExamRecordAddBo {
     /** 总分 */
     @ApiModelProperty("总分")
     private BigDecimal totalScore;
+    /** 做的题目id拼接 */
+    @ApiModelProperty("做的题目id拼接")
+    private String doQuestionIds;
+    /** 做对总题目id拼接 */
+    @ApiModelProperty("做对总题目id拼接")
+    private String rightQuestionIds;
 }

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

@@ -86,4 +86,11 @@ public class UserExamRecordEditBo {
     @ApiModelProperty("总分")
     private BigDecimal totalScore;
 
+    /** 做的题目id拼接 */
+    @ApiModelProperty("做的题目id拼接")
+    private String doQuestionIds;
+
+    /** 做对总题目id拼接 */
+    @ApiModelProperty("做对总题目id拼接")
+    private String rightQuestionIds;
 }

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

@@ -62,4 +62,8 @@ private static final long serialVersionUID=1L;
     private Long examTime;
     /** 总分 */
     private BigDecimal totalScore;
+    /** 做的题目id拼接 */
+    private String doQuestionIds;
+    /** 做对总题目id拼接 */
+    private String rightQuestionIds;
 }

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

@@ -99,4 +99,12 @@ public class UserExamRecordVo {
 	@Excel(name = "总分")
 	@ApiModelProperty("总分")
 	private BigDecimal totalScore;
+	/** 做的题目id拼接 */
+	@Excel(name = "做的题目id拼接")
+	@ApiModelProperty("做的题目id拼接")
+	private String doQuestionIds;
+	/** 做对总题目id拼接 */
+	@Excel(name = "做对总题目id拼接")
+	@ApiModelProperty("做对总题目id拼接")
+	private String rightQuestionIds;
 }

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

@@ -23,6 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="doTime" column="do_time"/>
         <result property="examTime" column="exam_time"/>
         <result property="totalScore" column="total_score"/>
+        <result property="doQuestionIds" column="do_question_ids"/>
+        <result property="rightQuestionIds" column="right_question_ids"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamRecordVo" id="UserExamRecordVoResult">
@@ -40,7 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="doQuestionNum" column="do_question_num"/>
         <result property="moduleExamId" column="module_exam_id"/>
         <result property="chapterExamId" column="chapter_exam_id"/>
-
+        <result property="doQuestionIds" column="do_question_ids"/>
+        <result property="rightQuestionIds" column="right_question_ids"/>
+        
         <result property="examName" column="exam_name"/>
         <result property="paperName" column="paper_name"/>
         <result property="doTime" column="do_time"/>