Merge branch 'dev' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionServiceImpl.java

@@ -211,7 +211,7 @@ public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, C
             }
         }
         //直播
-        if(entity.getSectionType()==2){
+        if(Validator.isNotEmpty(entity.getSectionType())&&entity.getSectionType()==2){
             if(Validator.isNotEmpty(entity.getSectionId())){
                 if(this.baseMapper.checkCrossLiveTime(entity.getLiveStartTime(),entity.getLiveEndTime(),entity.getSectionId(),entity.getLiveUrl())>0){
                     throw new CustomException("存在开播时间同房间号的直播节");

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

@@ -80,4 +80,7 @@ public class UserMockRecordAddBo {
     @ApiModelProperty("试卷总题数(含主观)")
     private Long allQuestionNum;
     private Long lessQuestionNum;
+    /** 提交时间 */
+    @ApiModelProperty("提交时间")
+    private Long commitTime;
 }

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

@@ -97,4 +97,7 @@ public class UserMockRecordEditBo {
     @ApiModelProperty("试卷总题数(含主观)")
     private Long allQuestionNum;
     private Long lessQuestionNum;
+    /** 提交时间 */
+    @ApiModelProperty("提交时间")
+    private Long commitTime;
 }

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

@@ -56,5 +56,7 @@ public class UserMockRecordQueryBo extends BaseEntity {
 	private Long moduleExamId;
 	@ApiModelProperty("章卷ID")
 	private Long chapterExamId;
-
+	/** 提交时间 */
+	@ApiModelProperty("提交时间")
+	private Long commitTime;
 }

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

@@ -74,4 +74,6 @@ private static final long serialVersionUID=1L;
     /** 试卷总题数(含主观) */
     private Long allQuestionNum;
     private Long lessQuestionNum;
+    /** 提交时间 */
+    private Long commitTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockRecordServiceImpl.java

@@ -165,6 +165,7 @@ public class UserMockRecordServiceImpl extends ServiceImpl<UserMockRecordMapper,
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setCommitTime(DateUtils.getNowTime());
         this.save(add);
         return add.getRecordId();
     }

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

@@ -114,4 +114,9 @@ public class UserMockRecordVo {
 	@Excel(name = "每场模考ID")
 	@ApiModelProperty("每场模考ID")
 	private Long eachExamId;
+
+	/** 提交时间 */
+	@Excel(name = "提交时间")
+	@ApiModelProperty("提交时间")
+	private Long commitTime;
 }

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

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="allQuestionNum" column="all_question_num"/>
         <result property="lessQuestionNum" column="less_question_num"/>
         <result property="eachExamId" column="each_exam_id"/>
+        <result property="commitTime" column="commit_time"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockRecordVo" id="UserMockRecordVoResult">
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="totalScore" column="total_score"/>
         <result property="score" column="score"/>
         <result property="eachExamId" column="each_exam_id"/>
+        <result property="commitTime" column="commit_time"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockWrongRecordVo" id="UserMockRecordQuestionVoResult">