|
|
|
@ -555,7 +555,7 @@ getTestItemManageSystemOAndUniversities
|
|
|
|
|
(
|
|
|
|
|
(
|
|
|
|
|
SELECT
|
|
|
|
|
a.add_time,
|
|
|
|
|
aa.add_time,
|
|
|
|
|
'超级管理员' AS add_type_text,
|
|
|
|
|
a.course_info_id,
|
|
|
|
|
aa.course_info_name AS course_info_name,
|
|
|
|
@ -588,7 +588,7 @@ UNION ALL
|
|
|
|
|
|
|
|
|
|
(
|
|
|
|
|
SELECT
|
|
|
|
|
b.add_time,
|
|
|
|
|
ba.add_time,
|
|
|
|
|
bc.`NAME` AS add_type_text,
|
|
|
|
|
b.teacher_open_course_merge_course_info_id AS course_info_id,
|
|
|
|
|
ba.course_info_name AS course_info_name,
|
|
|
|
@ -612,7 +612,7 @@ b.user_id,
|
|
|
|
|
'1' AS source_type
|
|
|
|
|
FROM
|
|
|
|
|
teacher_open_course_merge_resources_question b
|
|
|
|
|
LEFT JOIN teacher_open_course_merge_course_info ba ON ba.teacher_open_course_merge_course_info_id = b.teacher_open_course_merge_course_info_id
|
|
|
|
|
LEFT JOIN teacher_open_course_merge_course_info ba ON ba.teacher_open_course_merge_course_info_id = b.teacher_open_course_merge_course_info_id
|
|
|
|
|
LEFT JOIN teacher_open_course_merge_course_info bb ON bb.teacher_open_course_merge_course_info_id = ba.course_info_parent_id
|
|
|
|
|
LEFT JOIN core_org bc ON bc.ID = b.org_id
|
|
|
|
|
WHERE
|
|
|
|
@ -635,4 +635,4 @@ and tt.add_type_text like #'%'+addTypeText+'%'#
|
|
|
|
|
@if(!isEmpty(questionStem)){
|
|
|
|
|
and tt.question_stem like #'%'+questionStem+'%'#
|
|
|
|
|
@}
|
|
|
|
|
order by tt.add_time desc
|
|
|
|
|
order by tt.add_time desc
|
|
|
|
|