feat:服务指标明细

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

@@ -200,14 +200,6 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			List<StudentExtracurricularExercisesSituation> teacherServeWithDate = studentExtracurricularExercisesSituationDao.findTeacherServeWithDate(queryInfo.getMonday(), queryInfo.getSunday(), teacherIds);
 			Map<Integer, List<StudentExtracurricularExercisesSituation>> teacherServeMap = teacherServeWithDate.stream().filter(s -> "HOMEWORK".equals(s.getServeType())).collect(Collectors.groupingBy(StudentExtracurricularExercisesSituation::getTeacherId));
 			for (TeacherServeDto teacherServeDto : dataList) {
-				String mondayStr = DateUtil.dateToString(teacherServeDto.getMonday(), "yyyy-MM-dd");
-				if(!mondayTeacherRemindMap.containsKey(mondayStr)){
-					continue;
-				}
-				Map<Integer, List<TeacherRemind>> teacherRemindMap = mondayTeacherRemindMap.get(mondayStr);
-				if(!teacherRemindMap.containsKey(teacherServeDto.getTeacherId())){
-					continue;
-				}
 				if(teacherServeMap.containsKey(teacherServeDto.getTeacherId())){
 					List<StudentExtracurricularExercisesSituation> tss = teacherServeMap.get(teacherServeDto.getTeacherId());
 					Set<Long> courseIds = new HashSet<>();
@@ -220,6 +212,14 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 					}
 					teacherServeDto.setHomeworkNum(courseIds.size());
 				}
+				String mondayStr = DateUtil.dateToString(teacherServeDto.getMonday(), "yyyy-MM-dd");
+				if(!mondayTeacherRemindMap.containsKey(mondayStr)){
+					continue;
+				}
+				Map<Integer, List<TeacherRemind>> teacherRemindMap = mondayTeacherRemindMap.get(mondayStr);
+				if(!teacherRemindMap.containsKey(teacherServeDto.getTeacherId())){
+					continue;
+				}
 				TeacherRemind lastTeacherRemind = teacherRemindMap.get(teacherServeDto.getTeacherId()).stream().max(Comparator.comparing(TeacherRemind::getCreateTime)).get();
 				teacherServeDto.setOperatorName(lastTeacherRemind.getOperatorName());
 				teacherServeDto.setRemindDate(lastTeacherRemind.getCreateTime());