吴树波 1 mese fa
parent
commit
76be5c5f9a

+ 2 - 2
fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -9,6 +9,7 @@ import com.fs.common.core.domain.ResponseResult;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
+import com.fs.common.utils.date.DateUtil;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.mapper.CompanyUserMapper;
 import com.fs.course.config.CourseConfig;
@@ -115,8 +116,6 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     private FsCourseRedPacketLogMapper redPacketLogMapper;
     @Autowired
     private FsCourseFinishTempMapper fsCourseFinishTempMapper;
-    @Autowired
-    private FsUserCoursePeriodDaysMapper fsUserCoursePeriodDaysMapper;
 
     @Autowired
     private QwSopLogsMapper qwSopLogsMapper;
@@ -1042,6 +1041,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             FsUserCoursePeriodDays days = fsUserCoursePeriodDaysMapper.selectById(param.getId());
             vo.setStartDateTime(days.getStartDateTime());
             vo.setEndDateTime(days.getEndDateTime());
+            vo.setRang(DateUtil.isWithinRangeSafe(LocalDateTime.now(), days.getStartDateTime(), days.getEndDateTime()));
         }
         return ResponseResult.ok(vo);
     }

+ 1 - 0
fs-service-system/src/main/java/com/fs/course/vo/newfs/FsUserCourseVideoLinkDetailsVO.java

@@ -27,4 +27,5 @@ public class FsUserCourseVideoLinkDetailsVO {
     private LocalDateTime startDateTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDateTime;
+    private boolean isRang;
 }