change 3 سال پیش
والد
کامیت
9ecfb9c5a2

+ 0 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -241,7 +241,6 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
                 studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
                 studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
-
             }
             }
             goodsUserVo.setSecAllNum(secLong);
             goodsUserVo.setSecAllNum(secLong);
             goodsUserVo.setStuAllNum(studyLong);
             goodsUserVo.setStuAllNum(studyLong);

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

@@ -86,6 +86,11 @@ public class CourseUserChapterSectionVo {
 	@ApiModelProperty("1 需重修")
 	@ApiModelProperty("1 需重修")
 	private Integer rebuild;
 	private Integer rebuild;
 
 
+	/** 1模块卷 2章卷 3试卷 */
+	@Excel(name = "录播和回放的url地址")
+	@ApiModelProperty("录播和回放的url地址")
+	private String recordingUrl;
+
 	/** 直播开始时间 */
 	/** 直播开始时间 */
 	@ApiModelProperty("直播开始时间")
 	@ApiModelProperty("直播开始时间")
 	private Long liveStartTime;
 	private Long liveStartTime;

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java

@@ -198,7 +198,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
         }
         }
         //查询剩余考试次数
         //查询剩余考试次数
         Integer residueSubscribeNext = baseMapper.residueSubscribeNext(bo);
         Integer residueSubscribeNext = baseMapper.residueSubscribeNext(bo);
-        if (residueSubscribeNext < 1){
+        if (residueSubscribeNext == null && residueSubscribeNext < 1){
             return 3L;
             return 3L;
         }
         }
         Integer beforeSubscribeNext = baseMapper.beforeSubscribeNext(bo);
         Integer beforeSubscribeNext = baseMapper.beforeSubscribeNext(bo);

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

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