|
@@ -207,7 +207,7 @@
|
|
|
cs.status_ AS `status`,
|
|
|
g.subject_id_ AS subjectId,
|
|
|
sb.name_ AS subjectName,
|
|
|
- concat(cg.name_,'-第',cs.class_num_,'课') as courseGroupName,
|
|
|
+ concat(g.name_,'-第',cs.class_num_,'课') as courseGroupName,
|
|
|
u.del_flag_ as delFlag,
|
|
|
p.course_id_ AS courseId,
|
|
|
p.course_group_id_ AS courseGoupId,
|
|
@@ -602,7 +602,7 @@
|
|
|
AND g.subject_id_ = #{param.subjectId}
|
|
|
</if>
|
|
|
<if test="param.groupState !=null and param.groupState !=''">
|
|
|
- AND find_in_set(cg.status_, #{param.groupState})
|
|
|
+ AND find_in_set(g.status_, #{param.groupState})
|
|
|
</if>
|
|
|
<if test="param.courseState != null">
|
|
|
<if test="param.courseState == 'COMPLETE'">
|