Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_0511

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentExtracurricularExercisesSituationDao.java

@@ -166,7 +166,8 @@ public interface StudentExtracurricularExercisesSituationDao extends BaseDAO<Lon
 
     List<Long> queryCourseIdByClassDate(@Param("firstDayOfMonth") Date firstDayOfMonth,
                                        @Param("lastDayOfMonth") Date lastDayOfMonth,
-                                       @Param("teacherId") Integer teacherId);
+                                       @Param("teacherId") Integer teacherId,
+                                        @Param("musicGroupIds") List<String> musicGroupIds);
 
     /**
      * 统计服务周期内可布置的作业和训练数量

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentExtracurricularExercisesSituationServiceImpl.java

@@ -434,7 +434,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			firstDayOfMonth = queryInfo.getStartTime();
 			lastDayOfMonth = queryInfo.getEndTime();
 		}
-		List<Long> courseIds = studentExtracurricularExercisesSituationDao.queryCourseIdByClassDate(firstDayOfMonth,lastDayOfMonth,queryInfo.getTeacherId());
+		List<Long> courseIds = studentExtracurricularExercisesSituationDao.queryCourseIdByClassDate(firstDayOfMonth,lastDayOfMonth,queryInfo.getTeacherId(),null);
 		if(courseIds == null || courseIds.size() == 0){
 			return pageInfo;
 		}
@@ -687,7 +687,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
             courseIds.add(queryInfo.getCourseScheduleId().longValue());
         } else {
             courseIds = studentExtracurricularExercisesSituationDao.queryCourseIdByClassDate(firstDayOfMonth,
-                                                    lastDayOfMonth, queryInfo.getTeacherId());
+                                                    lastDayOfMonth, queryInfo.getTeacherId(),queryInfo.getMusicGroupIds());
         }
         if(courseIds == null || courseIds.size() == 0){
             return pageInfo;

mec-biz/src/main/resources/config/mybatis/StudentExtracurricularExercisesSituationMapper.xml

@@ -836,6 +836,12 @@
         left join lesson_examination le on le.course_schedule_id_ = csts.course_schedule_id_
         WHERE FIND_IN_SET(cs.id_, se.course_ids_) and le.id_ is null
         AND se.serve_type_ = 'HOMEWORK'
+        <if test="musicGroupIds != null and musicGroupIds.size > 0">
+            AND cs.music_group_id_ IN
+            <foreach collection="musicGroupIds" item="musicGroupId" open="(" close=")" separator=",">
+                #{musicGroupId}
+            </foreach>
+        </if>
         <if test="teacherId != null">
             AND csts.user_id_ = #{teacherId}
         </if>