|
@@ -203,7 +203,7 @@
|
|
|
<!-- 加载老师指定时间段内的排课信息 -->
|
|
|
<select id="loadTeacherSchedule" parameterType="hashmap" resultType="java.util.HashMap">
|
|
|
select sht.sheet_id sheetId,sht.course_date courseDate,sht.course_periods coursePeriods,clm.name_ classroomName,cls.class_name className,
|
|
|
- (select GROUP_CONCAT(DISTINCT e.employee_name) from t_employee e where locate(e.employee_id,sht.course_teachers)>0 group by '1' ) teacherNames
|
|
|
+ (select GROUP_CONCAT(DISTINCT e.employee_name) from t_employee e where e.employee_id=sht.course_teachers group by '1' ) teacherNames
|
|
|
from t_schedule_sheet sht
|
|
|
left join t_class cls on sht.class_id=cls.class_id and cls.del_if=false
|
|
|
left join t_class_room clm on sht.classroom_=clm.id_
|
|
@@ -217,7 +217,7 @@
|
|
|
<select id="loadStudentSchedule" parameterType="hashmap" resultType="java.util.HashMap">
|
|
|
<![CDATA[
|
|
|
select sht.sheet_id sheetId,sht.course_date courseDate,sht.course_periods coursePeriods,clm.name_ classroomName,cls.class_name className,bg.course_amount courseAmount,bg.free_amount freeAmount,
|
|
|
- (select GROUP_CONCAT(DISTINCT e.employee_name) from t_employee e where locate(e.employee_id,sht.course_teachers)>0 group by '1' ) teacherNames
|
|
|
+ (select GROUP_CONCAT(DISTINCT e.employee_name) from t_employee e where e.employee_id=sht.course_teachers group by '1' ) teacherNames
|
|
|
from t_schedule_sheet sht
|
|
|
left join t_class cls on sht.class_id=cls.class_id and cls.del_if=false
|
|
|
inner join t_buy_log bg on bg.class_id=cls.class_id and bg.del_if=false
|
|
@@ -231,10 +231,11 @@
|
|
|
]]>
|
|
|
</select>
|
|
|
|
|
|
+ <!-- 暂时默认一个班一个老师 locate(e.employee_id,sh.course_teachers)>0-->
|
|
|
<select id="getScheduleDtl" parameterType="string" resultType="java.util.HashMap">
|
|
|
<![CDATA[
|
|
|
select '青少宫校区' schoolName,clm.name_ classroomName,cls.class_name className,sh.class_id classId,sh.course_teachers courseTeachers,
|
|
|
- (select GROUP_CONCAT(DISTINCT e.employee_name) from t_employee e where locate(e.employee_id,sh.course_teachers)>0 group by '1' ) teacherNames,
|
|
|
+ (select GROUP_CONCAT(DISTINCT e.employee_name) from t_employee e where e.employee_id=sh.course_teachers group by '1' ) teacherNames,
|
|
|
sh.course_date courseDate,sh.course_periods coursePeriods,cls.start_date classStart,cls.end_date classEnd
|
|
|
from t_schedule_sheet sh
|
|
|
inner join t_class cls on sh.class_id=cls.class_id and cls.del_if=false
|