|
@@ -1070,9 +1070,9 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
List<IndexBaseMonthData> d2 = new ArrayList<>();
|
|
|
List<IndexBaseMonthData> d3 = new ArrayList<>();
|
|
|
if(StringUtils.isNotBlank(musicGroupId) && !CollectionUtils.isEmpty(studentIds)){
|
|
|
- d1 = studentExtracurricularExercisesSituationDao.getHomeworkData(startDayStr, endDayStr, null, studentIds);
|
|
|
- d2 = studentExtracurricularExercisesSituationDao.getHomeworkData(startDayStr, endDayStr, "submit", studentIds);
|
|
|
- d3 = studentExtracurricularExercisesSituationDao.getHomeworkData(startDayStr, endDayStr, "comment", studentIds);
|
|
|
+ d1 = studentExtracurricularExercisesSituationDao.getHomeworkData(startDayStr, endDayStr, musicGroupId,null, studentIds);
|
|
|
+ d2 = studentExtracurricularExercisesSituationDao.getHomeworkData(startDayStr, endDayStr, musicGroupId, "submit", studentIds);
|
|
|
+ d3 = studentExtracurricularExercisesSituationDao.getHomeworkData(startDayStr, endDayStr, musicGroupId, "comment", studentIds);
|
|
|
}
|
|
|
musicGroupHomeworkDataDeal(d1, mondayDateStrs, IndexDataType.HOMEWORK_CREATE_RATE);
|
|
|
typeDateMap.put(IndexDataType.HOMEWORK_CREATE_RATE, d1);
|