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