|
|
@@ -123,7 +123,7 @@
|
|
|
UNIX_TIMESTAMP(date_sub(teea.start_time, interval IFNULL(teea.prepare_seconds, tee.prepare_seconds) second)) * 1000 as prepareTime,
|
|
|
UNIX_TIMESTAMP(IFNULL(teea.start_time, tee.start_time)) * 1000 as minStartTime,
|
|
|
UNIX_TIMESTAMP(date_add(teea.start_time, interval IFNULL(teea.opening_seconds, tee.opening_seconds) second)) * 1000 as maxStartTime,
|
|
|
- IF(tee.mode = 'TOGETHER', UNIX_TIMESTAMP(IFNULL(teea.finish_time , tee.end_time)) * 1000, null) as maxFinishTime,
|
|
|
+ IF(tee.mode = 'TOGETHER' and tee.force_finish = 1, UNIX_TIMESTAMP(IFNULL(teea.finish_time , tee.end_time)) * 1000, null) as maxFinishTime,
|
|
|
tee.monitor_video_source as monitorVideoSourceStr,
|
|
|
tee.prepare_seconds as prepareSeconds,
|
|
|
teea.prepare_seconds as activityPrepareSeconds,
|
wangliang