|
@@ -253,7 +253,7 @@ public class StudentReportRecordController {
|
|
&& StudyStatusEnum.AttendDaySchool.getCode().equals(x.getStduyStatus())
|
|
&& StudyStatusEnum.AttendDaySchool.getCode().equals(x.getStduyStatus())
|
|
&& x.getReportTime() != null
|
|
&& x.getReportTime() != null
|
|
).count());
|
|
).count());
|
|
- Map<String, List<StudentReportRecordStatisticsListVo>> graduatedUniversityMap = dataList.stream().collect(Collectors.groupingBy(StudentReportRecordStatisticsListVo::getGraduatedUniversity));
|
|
|
|
|
|
+ Map<String, List<StudentReportRecordStatisticsListVo>> graduatedUniversityMap = dataList.stream().filter(x -> x.getReportTime() != null).collect(Collectors.groupingBy(StudentReportRecordStatisticsListVo::getGraduatedUniversity));
|
|
List<ItemCountVo> graduatedUniversityList = new ArrayList<>();
|
|
List<ItemCountVo> graduatedUniversityList = new ArrayList<>();
|
|
for (String graduatedUniversity : graduatedUniversityMap.keySet()) {
|
|
for (String graduatedUniversity : graduatedUniversityMap.keySet()) {
|
|
graduatedUniversityList.add(
|
|
graduatedUniversityList.add(
|