学习路径

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodVo.java

@@ -141,7 +141,10 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	private Integer sort;
 	@ApiModelProperty("课程排序")
 	private Integer courseSort;
-
+	/** 节类型 1录播 2直播 3回放 */
+	@Excel(name = "节类型 1录播 2直播 3回放")
+	@ApiModelProperty("节类型 1录播 2直播 3回放")
+	private Integer sectionType;
 	/** 审核时间 */
 	@Excel(name = "审核照片")
 	@ApiModelProperty("审核照片")

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

@@ -115,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="studyEndTime" column="study_end_time"/>
         <result property="durationTime" column="duration_time"/>
         <result property="courseSort" column="course_sort"/>
+        <result property="sectionType" column="section_type"/>
     </resultMap>
 
 
@@ -1066,7 +1067,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cm.sort,
         cm.menu_id as id,
         cm.course_id,
-        1 as type
+        1 as type,
+        NULL as section_type
         FROM
         course_menu cm
         where 1=1
@@ -1079,7 +1081,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cm.sort,
         cm.menu_id as id,
         cm.course_id,
-        2 as type
+        2 as type,
+        NULL as section_type
         FROM
         course_menu cm
         LEFT JOIN goods_course gc on gc.course_id = cm.course_id
@@ -1091,9 +1094,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cm.sort,
         cm.menu_id as id,
         cm.course_id,
-        3 as type
+        3 as type,
+        cs.section_type
         FROM
         course_menu cm
+        LEFT JOIN course_section cs on cm.menu_id = cs.section_id
         where 1=1
         <if test="courseId != null and courseId !='' ">
             and cm.course_id=#{courseId}
@@ -1105,9 +1110,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         ccs.sort,
         ccs.section_id AS id,
+        cs.section_type,
         3 AS type
         FROM
         course_chapter_section ccs
+        LEFT JOIN course_section cs on ccs.section_id = cs.section_id
         WHERE
         1 = 1
         <if test="chapterId != null and chapterId !='' ">