|
@@ -335,8 +335,8 @@
|
|
|
fcpd.last_join_time,
|
|
fcpd.last_join_time,
|
|
|
fcpd.id,
|
|
fcpd.id,
|
|
|
fcp.period_name,
|
|
fcp.period_name,
|
|
|
- if(ccut.start_date_time is null, fcpd.start_date_time, ccut.start_date_time) as startDateTime,
|
|
|
|
|
- if(ccut.end_date_time is null, fcpd.end_date_time, ccut.end_date_time) as endDateTime,
|
|
|
|
|
|
|
+ if(fcp.period_starting_time is null, fcpd.start_date_time, fcp.period_starting_time) as startDateTime,
|
|
|
|
|
+ if(fcp.period_end_time is null, fcpd.end_date_time, fcp.period_end_time) as endDateTime,
|
|
|
course.project as projectId
|
|
course.project as projectId
|
|
|
from `fs_user_course_video` video
|
|
from `fs_user_course_video` video
|
|
|
left join fs_user_course_period_days fcpd on fcpd.video_id = video.video_id
|
|
left join fs_user_course_period_days fcpd on fcpd.video_id = video.video_id
|