搜索条件新增

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserChapterSectionVo.java

@@ -101,4 +101,8 @@ public class CourseUserChapterSectionVo {
 
 	@ApiModelProperty("1已学习")
 	private Long learning;
+
+
+	@ApiModelProperty("做卷类型  1练习 2考试")
+	private Long doType;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterSectionMapper.xml

@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveStartTime" column="live_start_time"/>
         <result property="liveEndTime" column="live_end_time"/>
         <result property="recordingUrl" column="recording_url"/>
+        <result property="doType" column="do_type"/>
     </resultMap>
 
 

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyMapper.xml

@@ -221,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND cgu.user_id = #{userId}
           and cgu.grade_id = #{gradeId}
           AND cgu.period_status = 1
-          and unix_timestamp(now()) BETWEEN cg.class_start_time and cg.class_end_time
+           and (unix_timestamp(now()) < g.class_end_time or g.class_start_time is null)
           and cg.`status` =1
           and cgu.`status` =1
     </select>