|
@@ -155,6 +155,7 @@
|
|
|
WHERE
|
|
WHERE
|
|
|
mg.status_ IN ( 'PREPARE', 'PROGRESS' )
|
|
mg.status_ IN ( 'PREPARE', 'PROGRESS' )
|
|
|
AND sr.music_group_status_ = 'NORMAL'
|
|
AND sr.music_group_status_ = 'NORMAL'
|
|
|
|
|
+ AND DATE_FORMAT(sr.create_time_, '%Y-%m-%d')<=#{dayStr}
|
|
|
) UNION
|
|
) UNION
|
|
|
(
|
|
(
|
|
|
SELECT DISTINCT
|
|
SELECT DISTINCT
|
|
@@ -167,13 +168,13 @@
|
|
|
AND ( cs.is_lock_ = 0 OR cs.is_lock_ IS NULL )
|
|
AND ( cs.is_lock_ = 0 OR cs.is_lock_ IS NULL )
|
|
|
AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
|
|
AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
|
|
|
AND cs.organ_id_ IS NOT NULL
|
|
AND cs.organ_id_ IS NOT NULL
|
|
|
|
|
+ AND DATE_FORMAT(cssp.create_time_, '%Y-%m-%d')<=#{dayStr}
|
|
|
)) u
|
|
)) u
|
|
|
LEFT JOIN sys_user su ON u.user_id_ = su.id_
|
|
LEFT JOIN sys_user su ON u.user_id_ = su.id_
|
|
|
WHERE
|
|
WHERE
|
|
|
del_flag_=0
|
|
del_flag_=0
|
|
|
AND organ_id_ IS NOT NULL
|
|
AND organ_id_ IS NOT NULL
|
|
|
AND user_type_ LIKE '%STUDENT%'
|
|
AND user_type_ LIKE '%STUDENT%'
|
|
|
- AND DATE_FORMAT(create_time_, '%Y-%m-%d')<=#{dayStr}
|
|
|
|
|
GROUP BY organ_id_
|
|
GROUP BY organ_id_
|
|
|
ORDER BY organ_id_;
|
|
ORDER BY organ_id_;
|
|
|
</select>
|
|
</select>
|
