Merge branch 'dev-v5.2' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1036,9 +1036,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     periodId = userPeriodStatusAddBo.getId();
 
                 }
-                UserStudyRecordQueryBo queryBo = BeanUtil.toBean(entity, UserStudyRecordQueryBo.class);
-                UserStudyRecordVo recordVo = iUserStudyRecordService.queryLast(queryBo);
-                if(Validator.isEmpty(recordVo)||(Validator.isEmpty(recordVo.getStatus()))||recordVo.getStatus()!=1){
+                ClassPeriodVo queryBo = BeanUtil.toBean(entity, ClassPeriodVo.class);
+                Integer status = iUserStudyRecordService.getStudyStatus(queryBo);
+                if(Validator.isEmpty(status)||status!=1){
                     UserStudyRecord add = BeanUtil.toBean(entity, UserStudyRecord.class);
                     add.setCreateTime(DateUtils.getNowTime());
                     add.setUpdateTime(DateUtils.getNowTime());

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

@@ -86,4 +86,6 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 
 	List<SectionStudyRecordVo> listUserRecord(UserStudyRecordQueryBo bo);
 
+	Integer getStudyStatus(ClassPeriodVo bo);
+
 }

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

@@ -510,7 +510,10 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         return this.baseMapper.listUserRecord(bo);
     }
 
-
+    @Override
+    public Integer getStudyStatus(ClassPeriodVo bo) {
+        return this.baseMapper.getStudyStatus(bo);
+    }
 
 
     //判断当前未看完的节是否是点击播放的节