he2802 4 жил өмнө
parent
commit
3357d6f9c2

+ 3 - 6
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSectionAddBo.java

@@ -51,15 +51,12 @@ public class CourseSectionAddBo {
     /** 直播结束时间 */
     @ApiModelProperty("直播结束时间")
     private Long liveEndTime;
-    /** 直播节时长(分钟) */
-    @ApiModelProperty("直播节时长(分钟)")
-    private Long liveDuration;
     /** 录播和回放的url地址 */
     @ApiModelProperty("录播和回放的url地址")
     private String recordingUrl;
-    /** 录播和回放节时长(分钟) */
-    @ApiModelProperty("录播和回放节时长(分钟)")
-    private Long recordingDuration;
+    /** 节时长(分钟) */
+    @ApiModelProperty("节时长(分钟)")
+    private Long durationTime;
     /** 业务层级列表 */
     @ApiModelProperty("业务层级列表")
     private List<CourseSectionBusinessAddBo> businessList;

+ 3 - 6
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSectionEditBo.java

@@ -63,17 +63,14 @@ public class CourseSectionEditBo {
     @ApiModelProperty("直播结束时间")
     private Long liveEndTime;
 
-    /** 直播节时长(分钟) */
-    @ApiModelProperty("直播节时长(分钟)")
-    private Long liveDuration;
 
     /** 录播和回放的url地址 */
     @ApiModelProperty("录播和回放的url地址")
     private String recordingUrl;
 
-    /** 录播和回放节时长(分钟) */
-    @ApiModelProperty("录播和回放节时长(分钟)")
-    private Long recordingDuration;
+    /** 节时长(分钟) */
+    @ApiModelProperty("节时长(分钟)")
+    private Long durationTime;
 
     /** 业务层级列表 */
     @ApiModelProperty("业务层级列表")

+ 3 - 6
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSectionQueryBo.java

@@ -64,15 +64,12 @@ public class CourseSectionQueryBo extends BaseEntity {
 	/** 直播结束时间 */
 	@ApiModelProperty("直播结束时间")
 	private Long liveEndTime;
-	/** 直播节时长(分钟) */
-	@ApiModelProperty("直播节时长(分钟)")
-	private Long liveDuration;
 	/** 录播和回放的url地址 */
 	@ApiModelProperty("录播和回放的url地址")
 	private String recordingUrl;
-	/** 录播和回放节时长(分钟) */
-	@ApiModelProperty("录播和回放节时长(分钟)")
-	private Long recordingDuration;
+	/** 节时长(分钟) */
+	@ApiModelProperty("节时长(分钟)")
+	private Long durationTime;
 	/** 教育类型id */
 	@ApiModelProperty("教育类型id")
 	private Long educationTypeId;

+ 2 - 4
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSection.java

@@ -50,12 +50,10 @@ private static final long serialVersionUID=1L;
     private Long liveStartTime;
     /** 直播结束时间 */
     private Long liveEndTime;
-    /** 直播节时长(分钟) */
-    private Long liveDuration;
     /** 录播和回放的url地址 */
     private String recordingUrl;
-    /** 录播和回放节时长(分钟) */
-    private Long recordingDuration;
+    /** 节时长(分钟) */
+    private Long durationTime;
     /** 封面地址 */
     private String coverUrl;
     /** 编码 */

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

@@ -66,9 +66,8 @@ public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, C
         lqw.eq(StrUtil.isNotBlank(bo.getLiveUrl()), CourseSection::getLiveUrl, bo.getLiveUrl());
         lqw.eq(bo.getLiveStartTime() != null, CourseSection::getLiveStartTime, bo.getLiveStartTime());
         lqw.eq(bo.getLiveEndTime() != null, CourseSection::getLiveEndTime, bo.getLiveEndTime());
-        lqw.eq(bo.getLiveDuration() != null, CourseSection::getLiveDuration, bo.getLiveDuration());
         lqw.eq(StrUtil.isNotBlank(bo.getRecordingUrl()), CourseSection::getRecordingUrl, bo.getRecordingUrl());
-        lqw.eq(bo.getRecordingDuration() != null, CourseSection::getRecordingDuration, bo.getRecordingDuration());
+        lqw.eq(bo.getDurationTime() != null, CourseSection::getDurationTime, bo.getDurationTime());
         return entity2Vo(this.list(lqw));
     }
 

+ 4 - 8
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseSectionVo.java

@@ -62,18 +62,14 @@ public class CourseSectionVo {
 	@Excel(name = "直播结束时间")
 	@ApiModelProperty("直播结束时间")
 	private Long liveEndTime;
-	/** 直播节时长(分钟) */
-	@Excel(name = "直播节时长(分钟)")
-	@ApiModelProperty("直播节时长(分钟)")
-	private Long liveDuration;
 	/** 录播和回放的url地址 */
 	@Excel(name = "录播和回放的url地址")
 	@ApiModelProperty("录播和回放的url地址")
 	private String recordingUrl;
-	/** 录播和回放节时长(分钟) */
-	@Excel(name = "录播和回放节时长(分钟)")
-	@ApiModelProperty("录播和回放节时长(分钟)")
-	private Long recordingDuration;
+	/** 节时长(分钟) */
+	@Excel(name = "节时长(分钟)")
+	@ApiModelProperty("节时长(分钟)")
+	private Long durationTime;
 	/** 封面地址 */
 	@Excel(name = "封面地址")
 	@ApiModelProperty("封面地址")

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterMapper.xml

@@ -104,5 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="name != null and name != ''">
             AND c.name like concat('%', #{name}, '%')
         </if>
+        <if test="prefixName != null and prefixName != ''">
+            AND c.prefix_name like concat('%', #{prefixName}, '%')
+        </if>
    </select>
 </mapper>

+ 2 - 4
zhongzheng-system/src/main/resources/mapper/modules/course/CourseSectionMapper.xml

@@ -17,9 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveUrl" column="live_url"/>
         <result property="liveStartTime" column="live_start_time"/>
         <result property="liveEndTime" column="live_end_time"/>
-        <result property="liveDuration" column="live_duration"/>
         <result property="recordingUrl" column="recording_url"/>
-        <result property="recordingDuration" column="recording_duration"/>
+        <result property="durationTime" column="duration_time"/>
         <result property="coverUrl" column="cover_url"/>
         <result property="code" column="code"/>
     </resultMap>
@@ -36,9 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveUrl" column="live_url"/>
         <result property="liveStartTime" column="live_start_time"/>
         <result property="liveEndTime" column="live_end_time"/>
-        <result property="liveDuration" column="live_duration"/>
         <result property="recordingUrl" column="recording_url"/>
-        <result property="recordingDuration" column="recording_duration"/>
+        <result property="durationTime" column="duration_time"/>
         <result property="coverUrl" column="cover_url"/>
         <result property="code" column="code"/>
         <collection property="businessList" javaType="java.util.List" resultMap="CourseSectionBusiness"/>