|
|
@@ -118,17 +118,17 @@
|
|
|
tees.id as examStudentId,
|
|
|
tees.course_code as courseCode,
|
|
|
tees.course_name as courseName,
|
|
|
- tee.opening_seconds as openingSeconds,
|
|
|
+ IFNULL(teea.opening_seconds,tee.opening_seconds) as openingSeconds,
|
|
|
teea.opening_seconds as activityOpeningSeconds,
|
|
|
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' 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,
|
|
|
+ IFNULL(teea.prepare_seconds,tee.prepare_seconds) as prepareSeconds,
|
|
|
teea.prepare_seconds as activityPrepareSeconds,
|
|
|
tee.min_duration_seconds as minDurationSeconds,
|
|
|
- tee.max_duration_seconds as maxDurationSeconds,
|
|
|
+ IFNULL(teea.max_duration_seconds,tee.max_duration_seconds) as maxDurationSeconds,
|
|
|
teea.max_duration_seconds as activityMaxDurationSeconds,
|
|
|
tee.exam_count as examCount,
|
|
|
tee.force_finish as forceFinish,
|
wangliang