feat:乐团档案--作业情况

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

@@ -138,6 +138,7 @@ public interface StudentExtracurricularExercisesSituationDao extends BaseDAO<Lon
 
     List<IndexBaseMonthData> getHomeworkData(@Param("startDay") String startDay,
                                              @Param("endDay") String endDay,
+                                             @Param("musicGroupId") String musicGroupId,
                                              @Param("type") String type,
                                              @Param("studentIds") List<Integer> studentIds);
 

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

@@ -710,6 +710,7 @@
 		WHERE tea.job_nature_='FULL_TIME'
 		AND DATE_FORMAT(sees.monday_, '%Y-%m-%d')>=#{startDay}
 		AND DATE_FORMAT(sees.sunday_, '%Y-%m-%d')<=#{endDay}
+		AND (sees.serve_type_ = 'EXERCISE' OR EXISTS (SELECT id_ FROM course_schedule WHERE group_type_='MUSIC' AND music_group_id_=#{musicGroupId} AND FIND_IN_SET(id_, sees.course_ids_)))
 		AND sees.student_id_ IN
 		<foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
 			#{studentId}