|
@@ -250,7 +250,7 @@
|
|
|
and #{param.endTime} >= cssp.created_time_
|
|
|
</if>
|
|
|
</where>
|
|
|
- group by cssp.actual_price_
|
|
|
+ group by cssp.user_id_
|
|
|
order by cssp.id_ desc
|
|
|
</select>
|
|
|
|
|
@@ -529,6 +529,7 @@
|
|
|
</select>
|
|
|
<select id="selectLiveGroupPlan" resultType="com.yonge.cooleshow.biz.dal.vo.CourseSchedulePlanVo">
|
|
|
SELECT
|
|
|
+ distinct
|
|
|
cs.id_ AS courseId,
|
|
|
g.course_introduce_ AS courseIntroduce,
|
|
|
cs.class_num_ AS classNum,
|
|
@@ -536,14 +537,13 @@
|
|
|
cs.start_time_ AS startTime,
|
|
|
cs.end_time_ AS endTime,
|
|
|
ts.status_ AS salaryStatus,
|
|
|
- v.url_ AS url,
|
|
|
+ (select group_concat(lrv.url_) from live_room_video lrv where lrv.course_id_ = cs.id_)AS url,
|
|
|
cs.status_ AS courseStatus,
|
|
|
(CASE WHEN cs.start_time_ >= ta.sign_in_time_ THEN 1 ELSE 0 END) AS teacherInSign,
|
|
|
(CASE WHEN cs.end_time_ <= ta.sign_out_time_ THEN 1 ELSE 0 END) AS teacherOutSign
|
|
|
FROM course_schedule cs
|
|
|
LEFT JOIN course_group g ON cs.course_group_id_=g.id_
|
|
|
LEFT JOIN course_schedule_teacher_salary ts ON cs.id_=ts.course_schedule_id_
|
|
|
- LEFT JOIN live_room_video v ON cs.id_=v.course_id_
|
|
|
LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_
|
|
|
WHERE cs.course_group_id_= #{param.groupId}
|
|
|
<if test="param.salaryStatus != null and param.salaryStatus != ''">
|