|
@@ -2785,6 +2785,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
.distinct().collect(Collectors.toList());
|
|
|
List<Map<Long, Integer>> courseSettlementMaps = courseScheduleTeacherSalaryDao.checkCoursesIsSettlement(courseScheduleIds);
|
|
|
Map<Long, Long> courseSettlementMap = MapUtil.convertIntegerMap(courseSettlementMaps);
|
|
|
+ Map<Integer, Long> studentNumCourseMap = MapUtil.convertIntegerMap(studentAttendanceDao.countStudentAttendancesByCourses(courseScheduleIds));
|
|
|
dataList.forEach(courseSchedule -> {
|
|
|
Long isSettlement = courseSettlementMap.get(courseSchedule.getId().longValue());
|
|
|
if (Objects.isNull(isSettlement) || isSettlement <= 0) {
|
|
@@ -2792,6 +2793,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
} else {
|
|
|
courseSchedule.setIsSettlement(1);
|
|
|
}
|
|
|
+ Long studentNum = studentNumCourseMap.get(courseSchedule.getId());
|
|
|
+ if (Objects.nonNull(studentNum)) {
|
|
|
+ courseSchedule.setIsCallNames(studentNum > 0 ? YesOrNoEnum.YES : YesOrNoEnum.NO);
|
|
|
+ } else {
|
|
|
+ courseSchedule.setIsCallNames(YesOrNoEnum.NO);
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
}
|