@@ -511,7 +511,7 @@ public class StudentServeServiceImpl implements StudentServeService {
}
break;
case SUNDAY:
- if(DateUtil.daysBetween(studentHomework.getCourseStartTime(), studentHomework.getHomeworkCreateTime())<4){
+ if(DateUtil.daysBetween(studentHomework.getCourseStartTime(), studentHomework.getHomeworkCreateTime())<3){
studentHomeworksTmp.add(studentHomework);
@@ -1825,7 +1825,9 @@
cs.leave_student_num_,
cs.schoole_id_
FROM course_schedule cs
- WHERE cs.class_date_ BETWEEN #{startDate} AND #{endDate}
+ WHERE
+ (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
+ AND cs.class_date_ BETWEEN #{startDate} AND #{endDate}
AND cs.group_type_ = 'MUSIC'
AND (cs.del_flag_ IS NULL OR cs.del_flag_ = 0)
</select>