|
@@ -228,6 +228,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
List<StudentAttendance> studentAttendances = studentAttendanceDao.findByCourseIds(courseScheduleIds);
|
|
|
Map<Long, List<StudentAttendance>> courseStudentAttendancesMap = studentAttendances.stream().collect(Collectors.groupingBy(StudentAttendance::getCourseScheduleId));
|
|
|
|
|
|
+ //所有课程的教师考勤记录
|
|
|
+ List<TeacherAttendance> teacherAttendancesByCourseSchedule = teacherAttendanceDao.findTeacherIdByCourseSchedule(courseScheduleIds);
|
|
|
+ Map<Long, List<TeacherAttendance>> courseTeacherAttendancesMap = teacherAttendancesByCourseSchedule.stream().collect(Collectors.groupingBy(TeacherAttendance::getCourseScheduleId));
|
|
|
+
|
|
|
//获取未结算课程投诉记录
|
|
|
List<CourseScheduleComplaints> courseScheduleComplaints = courseScheduleComplaintsDao.findByCourseScheduleIds(courseScheduleIds);
|
|
|
//获取未结算课程学生缴费信息
|
|
@@ -270,6 +274,20 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ List<TeacherAttendance> teacherAttendances = courseTeacherAttendancesMap.get(courseScheduleTeacherSalary.getCourseScheduleId());
|
|
|
+ if(CollectionUtils.isEmpty(teacherAttendances)){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ int teacherAttendanceNum=0;
|
|
|
+ for (TeacherAttendance teacherAttendance : teacherAttendances) {
|
|
|
+ if(Objects.nonNull(teacherAttendance.getSignInTime())||Objects.nonNull(teacherAttendance.getSignOutTime())){
|
|
|
+ teacherAttendanceNum+=1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(teacherAttendanceNum==0){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
//当前课程缴费学生数量
|
|
|
BigDecimal courseStudentNum = new BigDecimal(studentPaymentsWithCourse.size());
|
|
|
|